From do-not-reply at jboss.org Tue Nov  8 11:33:03 2011
Content-Type: multipart/mixed; boundary="===============3576337578216796785=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: hornetq-commits at lists.jboss.org
Subject: [hornetq-commits] JBoss hornetq SVN: r11672 - in trunk:
 hornetq-jms/src/main/java/org/hornetq/jms/client and 1 other directory.
Date: Tue, 08 Nov 2011 11:33:03 -0500
Message-ID: <201111081633.pA8GX3nk023788@svn01.web.mwc.hst.phx2.redhat.com>

--===============3576337578216796785==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: borges
Date: 2011-11-08 11:33:01 -0500 (Tue, 08 Nov 2011)
New Revision: 11672

Modified:
   trunk/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java
   trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQConnection=
Factory.java
Log:
Fix NPEs

Modified: trunk/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java	2011-=
11-08 16:00:23 UTC (rev 11671)
+++ trunk/hornetq-commons/src/main/java/org/hornetq/utils/Base64.java	2011-=
11-08 16:33:01 UTC (rev 11672)
@@ -1692,7 +1692,10 @@
       {
          try
          {
-            bis.close();
+            if (bis !=3D null)
+            {
+               bis.close();
+            }
          }
          catch (Exception e)
          {

Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQCon=
nectionFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQConnectio=
nFactory.java	2011-11-08 16:00:23 UTC (rev 11671)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQConnectio=
nFactory.java	2011-11-08 16:33:01 UTC (rev 11672)
@@ -38,7 +38,7 @@
 =

 /**
  * HornetQ implementation of a JMS ConnectionFactory.
- * =

+ *
  * @author <a href=3D"mailto:ovidiu(a)feodorov.com">Ovidiu Feodorov</a>
  * @author <a href=3D"mailto:tim.fox(a)jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt> $Id$
@@ -71,11 +71,11 @@
    {
       serverLocator =3D null;
    }
-   =

+
    public HornetQConnectionFactory(final ServerLocator serverLocator)
    {
       this.serverLocator =3D serverLocator;
-      =

+
       serverLocator.disableFinalizeCheck();
    }
 =

@@ -89,7 +89,7 @@
       {
          serverLocator =3D HornetQClient.createServerLocatorWithoutHA(grou=
pConfiguration);
       }
-      =

+
       serverLocator.disableFinalizeCheck();
    }
 =

@@ -103,7 +103,7 @@
       {
          serverLocator =3D HornetQClient.createServerLocatorWithoutHA(init=
ialConnectors);
       }
-      =

+
       serverLocator.disableFinalizeCheck();
    }
 =

@@ -128,7 +128,7 @@
 =

    public QueueConnection createQueueConnection(final String username, fin=
al String password) throws JMSException
    {
-      return (QueueConnection)createConnectionInternal(username, password,=
 false, HornetQConnection.TYPE_QUEUE_CONNECTION);
+      return createConnectionInternal(username, password, false, HornetQCo=
nnection.TYPE_QUEUE_CONNECTION);
    }
 =

    // TopicConnectionFactory implementation ------------------------------=
--------------------------
@@ -140,7 +140,7 @@
 =

    public TopicConnection createTopicConnection(final String username, fin=
al String password) throws JMSException
    {
-      return (TopicConnection)createConnectionInternal(username, password,=
 false, HornetQConnection.TYPE_TOPIC_CONNECTION);
+      return createConnectionInternal(username, password, false, HornetQCo=
nnection.TYPE_TOPIC_CONNECTION);
    }
 =

    // XAConnectionFactory implementation ---------------------------------=
--------------------------
@@ -473,7 +473,7 @@
       checkWrite();
       return serverLocator.getInitialConnectAttempts();
    }
-   =

+
    public synchronized boolean isFailoverOnInitialConnection()
    {
       return serverLocator.isFailoverOnInitialConnection();
@@ -538,22 +538,22 @@
    {
       return serverLocator.getGroupID();
    }
-   =

+
    public boolean isCompressLargeMessage()
    {
       return serverLocator.isCompressLargeMessage();
    }
-   =

+
    public void setCompressLargeMessage(boolean compress)
    {
       serverLocator.setCompressLargeMessage(compress);
    }
-   =

+
    public void close()
    {
       serverLocator.close();
    }
-   =

+
    public ServerLocator getServerLocator()
    {
       return serverLocator;
@@ -564,7 +564,7 @@
       return JMSFactoryType.CF.intValue();
    }
    /**
-    * =

+    *
     * @deprecated use {@link ServerLocator#createSessionFactory()}
     * @return
     */
@@ -582,7 +582,7 @@
          throw ex;
       }
    }
-   =

+
    // Package protected --------------------------------------------------=
--------------------------
 =

    // Protected ----------------------------------------------------------=
--------------------------
@@ -595,7 +595,7 @@
       readOnly =3D true;
 =

       ClientSessionFactory factory;
-      =

+
       try
       {
          factory =3D serverLocator.createSessionFactory();
@@ -603,15 +603,15 @@
       catch (Exception e)
       {
          JMSException jmse =3D new JMSException("Failed to create session =
factory");
-         =

+
          jmse.initCause(e);
          jmse.setLinkedException(e);
-         =

+
          throw jmse;
       }
 =

       HornetQConnection connection =3D null;
-      =

+
       if (isXA)
       {
          if (type =3D=3D HornetQConnection.TYPE_GENERIC_CONNECTION)
@@ -676,9 +676,15 @@
                                                     dupsOKBatchSize,
                                                     transactionBatchSize,
                                                     factory);
-         }         =

+         }
       }
+
+      if (connection =3D=3D null)
+      {
+         new JMSException("Failed to create connection: invalid type " + t=
ype);
+      }
       connection.setReference(this);
+
       try
       {
          connection.authorize();
@@ -708,6 +714,7 @@
       }
    }
 =

+   @Override
    public void finalize() throws Throwable
    {
       try


--===============3576337578216796785==--