[hornetq-commits] JBoss hornetq SVN: r12060 - in trunk/hornetq-core/src/main/java/org/hornetq/core: paging/cursor/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: borges
Date: 2012-02-01 11:48:14 -0500 (Wed, 01 Feb 2012)
New Revision: 12060

Modified:
   trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
   trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java
Log:
Reduce visibility after merge.

Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java	2012-02-01 16:37:41 UTC (rev 12059)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java	2012-02-01 16:48:14 UTC (rev 12060)
@@ -1238,7 +1238,7 @@
       doClose(true);
    }
 
-   protected void doClose(final boolean sendClose)
+   private void doClose(final boolean sendClose)
    {
       if (state == STATE.CLOSED)
       {
@@ -1477,7 +1477,7 @@
    {
       List<DiscoveryEntry> newConnectors = discoveryGroup.getDiscoveryEntries();
 
-      
+
       TransportConfiguration[] newInitialconnectors = (TransportConfiguration[])Array.newInstance(TransportConfiguration.class,
                                                                            newConnectors.size());
 
@@ -1493,14 +1493,14 @@
             topology.updateMember(0, entry.getNodeID(), member);
          }
       }
-      
+
       this.initialConnectors = newInitialconnectors;
 
       if (clusterConnection && !receivedTopology && initialConnectors.length > 0)
       {
          // The node is alone in the cluster. We create a connection to the new node
          // to trigger the node notification to form the cluster.
-         
+
          Runnable connectRunnable = new Runnable()
          {
             public void run()
@@ -1531,13 +1531,13 @@
       synchronized (factories)
       {
          factories.remove(factory);
-   
+
          if (!clusterConnection && factories.isEmpty())
          {
             // Go back to using the broadcast or static list
-   
+
             receivedTopology = false;
-   
+
             topologyArray = null;
          }
       }
@@ -1586,7 +1586,7 @@
       }
    }
 
-   class StaticConnector implements Serializable
+   private final class StaticConnector implements Serializable
    {
       private static final long serialVersionUID = 6772279632415242634l;
 
@@ -1729,7 +1729,8 @@
          }
       }
 
-      public void finalize() throws Throwable
+      @Override
+      protected void finalize() throws Throwable
       {
          if (!isClosed() && finalizeCheck)
          {
@@ -1749,9 +1750,9 @@
          super.finalize();
       }
 
-      class Connector
+      private final class Connector
       {
-         private TransportConfiguration initialConnector;
+         private final TransportConfiguration initialConnector;
 
          private volatile ClientSessionFactoryInternal factory;
 
@@ -1777,7 +1778,7 @@
                if (factoryToUse != null)
                {
                   addToConnecting(factoryToUse);
-                  
+
                   try
                   {
                      factoryToUse.connect(1, false);

Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java	2012-02-01 16:37:41 UTC (rev 12059)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java	2012-02-01 16:48:14 UTC (rev 12060)
@@ -36,7 +36,7 @@
 
 /**
  * A PageProviderIMpl
- * 
+ *
  * TODO: this may be moved entirely into PagingStore as there's an one-to-one relationship here
  *       However I want to keep this isolated as much as possible during development
  *
@@ -49,7 +49,7 @@
    // Constants -----------------------------------------------------
 
    private static final Logger log = Logger.getLogger(PageCursorProviderImpl.class);
-   
+
    boolean isTrace = log.isTraceEnabled();
 
    // Attributes ----------------------------------------------------
@@ -350,7 +350,7 @@
             {
                return;
             }
-            
+
             if (log.isDebugEnabled())
             {
                log.debug("Asserting cleanup for address " + this.pagingStore.getAddress());
@@ -373,7 +373,7 @@
                      {
                         log.debug("Cursor " + cursor + " was considered incomplete at page " + minPage);
                      }
-                     
+
                      complete = false;
                      break;
                   }
@@ -399,7 +399,7 @@
                      log.debug("Address " + pagingStore.getAddress() +
                            " is leaving page mode as all messages are consumed and acknowledged from the page store");
                   }
-                  
+
                   pagingStore.forceAnotherPage();
 
                   Page currentPage = pagingStore.getCurrentPage();
@@ -465,7 +465,7 @@
             {
                cache = softCache.get((long)depagedPage.getPageId());
             }
-            
+
             if (isTrace)
             {
                log.trace("Removing page " + depagedPage.getPageId() + " from page-cache");
@@ -477,7 +477,7 @@
                // We need to read the page-file before deleting it
                // to make sure we remove any large-messages pending
                storageManager.beforePageRead();
-               
+
                List<PagedMessage> pgdMessagesList = null;
                try
                {
@@ -493,7 +493,7 @@
                   catch (Exception e)
                   {
                   }
-                  
+
                   storageManager.afterPageRead();
                }
                depagedPage.close();
@@ -505,7 +505,7 @@
             }
 
             depagedPage.delete(pgdMessages);
-            
+
             synchronized (softCache)
             {
                softCache.remove((long)depagedPage.getPageId());
@@ -525,7 +525,7 @@
     * @param currentPage
     * @throws Exception
     */
-   protected void storePositions(ArrayList<PageSubscription> cursorList, Page currentPage) throws Exception
+   private void storePositions(ArrayList<PageSubscription> cursorList, Page currentPage) throws Exception
    {
       try
       {