[jboss-cvs] JBoss Messaging SVN: r5135 - in trunk: src/main/org/jboss/messaging/core/server/impl and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2008-10-17 12:46:30 -0400 (Fri, 17 Oct 2008)
New Revision: 5135

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
   trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
   trunk/src/main/org/jboss/messaging/util/VersionLoader.java
   trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java
Log:
Placing the VersionLoader::version cached in a static field

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2008-10-17 16:37:55 UTC (rev 5134)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2008-10-17 16:46:30 UTC (rev 5135)
@@ -474,7 +474,7 @@
                                                             final boolean autoCommitAcks,                                                            
                                                             final boolean cacheProducers) throws MessagingException
    {
-      Version clientVersion = VersionLoader.load();
+      Version clientVersion = VersionLoader.getVersion();
 
       RemotingConnection connection = null;
       try

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2008-10-17 16:37:55 UTC (rev 5134)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2008-10-17 16:46:30 UTC (rev 5135)
@@ -140,7 +140,7 @@
    {
       // We need to hard code the version information into a source file
 
-      version = VersionLoader.load();
+      version = VersionLoader.getVersion();
    }
 
    // lifecycle methods

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java	2008-10-17 16:37:55 UTC (rev 5134)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java	2008-10-17 16:46:30 UTC (rev 5135)
@@ -138,7 +138,7 @@
       
       uid = UUIDGenerator.getInstance().generateSimpleStringUUID();    
       
-      thisVersion = VersionLoader.load();
+      thisVersion = VersionLoader.getVersion();
    }
 
    // Connection implementation --------------------------------------------------------------------

Modified: trunk/src/main/org/jboss/messaging/util/VersionLoader.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/VersionLoader.java	2008-10-17 16:37:55 UTC (rev 5134)
+++ trunk/src/main/org/jboss/messaging/util/VersionLoader.java	2008-10-17 16:46:30 UTC (rev 5135)
@@ -26,6 +26,7 @@
 import java.io.InputStream;
 import java.util.Properties;
 
+import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.version.Version;
 import org.jboss.messaging.core.version.impl.VersionImpl;
 
@@ -37,8 +38,37 @@
 public class VersionLoader
 {
 
-   public static Version load()
+   private static final Logger log = Logger.getLogger(VersionLoader.class);
+
+   
+   private static Version version;
+   
+   static
    {
+      try
+      {
+         version = load();
+      }
+      catch (Throwable e)
+      {
+         version = null;
+         log.error(e.getMessage(), e);
+      }
+      
+   }
+
+   public static Version getVersion()
+   {
+      if (version == null)
+      {
+         throw new RuntimeException("version.properties is not available");
+      }
+      
+      return version;
+   }
+   
+   private static Version load()
+   {
       Properties versionProps = new Properties();
       InputStream in = VersionImpl.class.getClassLoader().getResourceAsStream("version.properties");
       try

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java	2008-10-17 16:37:55 UTC (rev 5134)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/util/VersionLoaderTest.java	2008-10-17 16:46:30 UTC (rev 5135)
@@ -51,7 +51,7 @@
 
    public void testLoadVersion() throws Exception
    {
-      Version version = VersionLoader.load();
+      Version version = VersionLoader.getVersion();
       Properties props = new Properties();
       props.load(ClassLoader.getSystemResourceAsStream("version.properties"));