[hornetq-commits] JBoss hornetq SVN: r11709 - trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl.

Author: borges Date: 2011-11-18 05:47:05 -0500 (Fri, 18 Nov 2011) New Revision: 11709 Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java Log: Avoid hiding owner class' field. Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-11-18 10:46:53 UTC (rev 11708) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/impl/HornetQServerImpl.java 2011-11-18 10:47:05 UTC (rev 11709) @@ -2022,7 +2022,7 @@ private final class SharedNothingBackupActivation implements Activation { - private ServerLocatorInternal serverLocator; + private ServerLocatorInternal serverLocator0; private volatile boolean failedConnection; public void run() @@ -2042,11 +2042,11 @@ clusterManager.start(); final TransportConfiguration config = configuration.getConnectorConfigurations().get(liveConnectorName); - serverLocator = (ServerLocatorInternal)HornetQClient.createServerLocatorWithHA(config); - final QuorumManager quorumManager = new QuorumManager(serverLocator); + serverLocator0 = (ServerLocatorInternal)HornetQClient.createServerLocatorWithHA(config); + final QuorumManager quorumManager = new QuorumManager(serverLocator0); replicationEndpoint.setQuorumManager(quorumManager); - serverLocator.setReconnectAttempts(-1); + serverLocator0.setReconnectAttempts(-1); threadPool.execute(new Runnable() { @@ -2055,7 +2055,7 @@ { try { - final ClientSessionFactory liveServerSessionFactory = serverLocator.connect(); + final ClientSessionFactory liveServerSessionFactory = serverLocator0.connect(); if (liveServerSessionFactory == null) { // XXX HORNETQ-768 @@ -2111,7 +2111,7 @@ } } - serverLocator.close(); + serverLocator0.close(); replicationEndpoint.stop(); if (failedConnection) @@ -2148,10 +2148,10 @@ public void close(final boolean permanently) throws Exception { - if (serverLocator != null) + if (serverLocator0 != null) { - serverLocator.close(); - serverLocator = null; + serverLocator0.close(); + serverLocator0 = null; } if (configuration.isBackup())