[or-cvs] r15596: Fixed two bugs found by Sebastian. (puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl)

[kloesing@xxxxxxxx]

Author: kloesing
Date: 2008-07-02 07:17:25 -0400 (Wed, 02 Jul 2008)
New Revision: 15596

Modified:
   puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/NetworkImpl.java
   puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/RouterNodeImpl.java
Log:
Fixed two bugs found by Sebastian.

Modified: puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/NetworkImpl.java
===================================================================
--- puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/NetworkImpl.java	2008-07-02 10:37:22 UTC (rev 15595)
+++ puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/NetworkImpl.java	2008-07-02 11:17:25 UTC (rev 15596)
@@ -811,7 +811,7 @@
 				try {
 					node.shutdown();
 				} catch (PuppeTorException e) {
-					if (firstCaughtException != null) {
+					if (firstCaughtException == null) {
 						firstCaughtException = e;
 					}
 				}

Modified: puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/RouterNodeImpl.java
===================================================================
--- puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/RouterNodeImpl.java	2008-07-02 10:37:22 UTC (rev 15595)
+++ puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/RouterNodeImpl.java	2008-07-02 11:17:25 UTC (rev 15596)
@@ -303,7 +303,7 @@
 			IllegalArgumentException e = new IllegalArgumentException(
 					"nodeName=" + nodeName + ", controlPort=" + controlPort
 							+ ", socksPort=" + socksPort + ", orPort="
-							+ this.orPort + ", dirPort=" + this.dirPort
+							+ orPort + ", dirPort=" + dirPort
 							+ ", serverIpAddress='" + serverIpAddress + "'");
 			this.logger
 					.throwing(this.getClass().getName(), "RouterNodeImpl", e);