Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
1. Controller switchEvents queue should be priority based. The queue holds switch...
[controller.git]
/
opendaylight
/
protocol_plugins
/
openflow
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
protocol_plugin
/
openflow
/
core
/
internal
/
ControllerIO.java
diff --git
a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java
b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java
index a4b75843376071ba402729f63e591c2e7bb0b7fe..868e2086511b5cd7926ccb08275cbda6bb270c9d 100644
(file)
--- a/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java
+++ b/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/ControllerIO.java
@@
-1,4
+1,3
@@
-
/*
* Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
*
/*
* Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
*
@@
-40,8
+39,8
@@
public class ControllerIO {
try {
openFlowPort = Short.decode(portString).shortValue();
} catch (NumberFormatException e) {
try {
openFlowPort = Short.decode(portString).shortValue();
} catch (NumberFormatException e) {
- logger.warn("Invalid port:
" + portString + ", use default("
-
+ openFlowPort + ")"
);
+ logger.warn("Invalid port:
{}, use default({})", portString,
+
openFlowPort
);
}
}
}
}
}
}
@@
-72,8
+71,8
@@
public class ControllerIO {
SelectionKey skey = selectedKeys.next();
selectedKeys.remove();
if (skey.isValid() && skey.isAcceptable()) {
SelectionKey skey = selectedKeys.next();
selectedKeys.remove();
if (skey.isValid() && skey.isAcceptable()) {
- ((Controller) listener).handleNewConnection(selector,
- serverSelectionKey);
+ ((Controller) listener).handleNewConnection(
+ se
lector, se
rverSelectionKey);
}
}
} catch (Exception e) {
}
}
} catch (Exception e) {
@@
-83,7
+82,7
@@
public class ControllerIO {
}
}, "ControllerI/O Thread");
controllerIOThread.start();
}
}, "ControllerI/O Thread");
controllerIOThread.start();
- logger.info("Controller is now listening on port
" +
openFlowPort);
+ logger.info("Controller is now listening on port
{}",
openFlowPort);
}
public void shutDown() throws IOException {
}
public void shutDown() throws IOException {