[or-cvs] r11661: removed synchronized modifier from getter to avoid deadlock (puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl)

[kloesing at seul.org]

Author: kloesing
Date: 2007-09-27 06:28:51 -0400 (Thu, 27 Sep 2007)
New Revision: 11661

Modified:
   puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/ProxyNodeImpl.java
Log:
removed synchronized modifier from getter to avoid deadlock

Modified: puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/ProxyNodeImpl.java
===================================================================
--- puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/ProxyNodeImpl.java	2007-09-27 10:20:29 UTC (rev 11660)
+++ puppetor/trunk/src/de/uniba/wiai/lspi/puppetor/impl/ProxyNodeImpl.java	2007-09-27 10:28:51 UTC (rev 11661)
@@ -513,7 +513,7 @@
 		this.logger.exiting(this.getClass().getName(), "configureDirServers");
 	}
 
-	public synchronized String getNodeName() {
+	public String getNodeName() {
 		return this.nodeName;
 	}
 
@@ -755,7 +755,8 @@
 				String line = null;
 				try {
 					while ((line = br.readLine()) != null) {
-						eventManager.observeUnparsedEvent(nodeName, line);
+						eventManager.observeUnparsedEvent(ProxyNodeImpl.this
+								.getNodeName(), line);
 					}
 				} catch (IOException e) {
 
@@ -763,7 +764,8 @@
 					// is running; otherwise, silently ignore it...
 					if (nodeState == NodeState.RUNNING) {
 						String reason = "IOException when reading output from Tor "
-								+ "process " + nodeName + "!";
+								+ "process " + ProxyNodeImpl.this
+								.getNodeName() + "!";
 						logger.log(Level.WARNING, reason, e);
 					}
 				}