Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Resolving http://bugs.opendaylight.org/show_bug.cgi?id=4
[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 e1bc2d0c1446a9c6e8b2999f9345a22300b11e62..3e39ab26e6680603391da98b08bef1d82e1df6ba 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
@@
-76,9
+76,8
@@
public class ControllerIO {
serverSelectionKey);
}
}
serverSelectionKey);
}
}
- } catch (IOException e) {
- logger.error("Caught I/O Exception: " + e.toString());
- return;
+ } catch (Exception e) {
+ continue;
}
}
}
}
}
}
@@
-87,13
+86,9
@@
public class ControllerIO {
logger.info("Controller is now listening on port " + openFlowPort);
}
logger.info("Controller is now listening on port " + openFlowPort);
}
- public void shutDown() {
+ public void shutDown()
throws IOException
{
this.running = false;
this.selector.wakeup();
this.running = false;
this.selector.wakeup();
- try {
- this.serverSocket.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ this.serverSocket.close();
}
}
}
}