[hornetq-commits] JBoss hornetq SVN: r8919 - in trunk: tests/src/org/hornetq/tests/unit/jms/client and 1 other directory.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2010-03-08 11:31:20 -0500 (Mon, 08 Mar 2010)
New Revision: 8919

Modified:
   trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java
   trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java
Log:
fix JMS StreamMessage implementation (again!)

* readChar throws a NPE when reading a null String but a MessageFormatException
  if the String is not null...

Modified: trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java	2010-03-08 15:34:57 UTC (rev 8918)
+++ trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java	2010-03-08 16:31:20 UTC (rev 8919)
@@ -191,6 +191,16 @@
          {
             case DataConstants.CHAR:
                return (char)getBuffer().readShort();
+            case DataConstants.STRING:
+               String str = getBuffer().readNullableString();
+               if (str == null)
+               {
+                  throw new NullPointerException("Invalid conversion");
+               }
+               else
+               {
+                  throw new MessageFormatException("Invalid conversion");
+               }
             default:
                throw new MessageFormatException("Invalid conversion");
          }

Modified: trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java	2010-03-08 15:34:57 UTC (rev 8918)
+++ trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java	2010-03-08 16:31:20 UTC (rev 8919)
@@ -353,7 +353,7 @@
          message.readChar();
          fail();
       }
-      catch (MessageFormatException e)
+      catch (NullPointerException e)
       {
       }
    }