[jboss-cvs] JBoss Messaging SVN: r5877 - trunk/src/main/org/jboss/messaging/jms/client.

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

Author: jmesnil
Date: 2009-02-16 10:56:28 -0500 (Mon, 16 Feb 2009)
New Revision: 5877

Modified:
   trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
   trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
Log:
fixed exception handling making sure the right JMSException subclass is thrown

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java	2009-02-16 15:55:36 UTC (rev 5876)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java	2009-02-16 15:56:28 UTC (rev 5877)
@@ -890,11 +890,7 @@
       }
       catch (MessagingException e)
       {
-         JMSException je = new JMSException(e.toString());
-
-         je.initCause(e);
-
-         throw je;
+         throw JMSExceptionHelper.convertFromMessagingException(e);
       }
    }
 

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java	2009-02-16 15:55:36 UTC (rev 5876)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java	2009-02-16 15:56:28 UTC (rev 5877)
@@ -63,6 +63,7 @@
 import org.jboss.messaging.core.client.ClientProducer;
 import org.jboss.messaging.core.client.ClientSession;
 import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.filter.impl.FilterImpl;
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage;
 import org.jboss.messaging.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
@@ -635,6 +636,14 @@
          filterString = null;
       }
 
+      // eager test of the filter syntax as required by JMS spec
+      try {
+         FilterImpl.createFilter(filterString);
+      } catch (MessagingException e)
+      {
+         throw JMSExceptionHelper.convertFromMessagingException(e);
+      }
+      
       JBossQueue jbq = (JBossQueue) queue;
 
       try
@@ -647,7 +656,7 @@
       }
       catch (MessagingException e)
       {
-         JMSExceptionHelper.convertFromMessagingException(e);
+         throw JMSExceptionHelper.convertFromMessagingException(e);
       }
 
       return new JBossQueueBrowser(jbq, filterString, session);