Code Review
/
packetcable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
The second patch of an estimated 4 to complete the COPS message refactoring as descri...
[packetcable.git]
/
packetcable-driver
/
src
/
main
/
java
/
org
/
umu
/
cops
/
prpep
/
COPSPepConnection.java
diff --git
a/packetcable-driver/src/main/java/org/umu/cops/prpep/COPSPepConnection.java
b/packetcable-driver/src/main/java/org/umu/cops/prpep/COPSPepConnection.java
index 89943ddc250cfcb038980d13da035452a8bfc8cb..68e0ea59973fa7b66a9ff6784fb245c49ee14330 100644
(file)
--- a/
packetcable-driver/src/main/java/org/umu/cops/prpep/COPSPepConnection.java
+++ b/
packetcable-driver/src/main/java/org/umu/cops/prpep/COPSPepConnection.java
@@
-9,6
+9,8
@@
package org.umu.cops.prpep;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.umu.cops.stack.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.umu.cops.stack.*;
+import org.umu.cops.stack.COPSDecision.Command;
+import org.umu.cops.stack.COPSDecision.DecisionFlag;
import java.io.IOException;
import java.net.Socket;
import java.io.IOException;
import java.net.Socket;
@@
-398,8
+400,9
@@
public class COPSPepConnection implements Runnable {
logger.warn("Unable to find state manager with key - " + handle.getId().str());
// Check message type
logger.warn("Unable to find state manager with key - " + handle.getId().str());
// Check message type
- if (decision.getFlags() == COPSDecision.F_REQSTATE) {
- if (decision.isRemoveDecision())
+ // TODO FIXME - Use of manager object could result in a NPE
+ if (decision.getFlag().equals(DecisionFlag.REQSTATE)) {
+ if (decision.getCommand().equals(Command.REMOVE))
// Delete Request State
manager.processDeleteRequestState(dMsg);
else
// Delete Request State
manager.processDeleteRequestState(dMsg);
else
@@
-427,6
+430,7
@@
public class COPSPepConnection implements Runnable {
if (manager == null)
logger.warn("Unable to find state manager with key - " + handle.getId().str());
if (manager == null)
logger.warn("Unable to find state manager with key - " + handle.getId().str());
+ // TODO FIXME - Use of manager object could result in a NPE
manager.processOpenNewRequestState();
}
manager.processOpenNewRequestState();
}
@@
-452,7
+456,7
@@
public class COPSPepConnection implements Runnable {
logger.warn("Unsupported objects (Integrity) to connection " + conn.getInetAddress());
}
logger.warn("Unsupported objects (Integrity) to connection " + conn.getInetAddress());
}
- COPSPepReqStateMan manager =
(COPSPepReqStateMan)
_managerMap.get(cMsg.getClientHandle().getId().str());
+ COPSPepReqStateMan manager = _managerMap.get(cMsg.getClientHandle().getId().str());
if (manager == null) {
logger.warn("Unable to find state manager with key - " + cMsg.getClientHandle().getId().str());
} else {
if (manager == null) {
logger.warn("Unable to find state manager with key - " + cMsg.getClientHandle().getId().str());
} else {