JSR-356 addMessageHandler with Reader or InputStream should not NPE

jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/InputStreamDecoder.java

@@ -0,0 +1,45 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.websocket.jsr356.decoders;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.websocket.DecodeException;
+import javax.websocket.Decoder;
+import javax.websocket.EndpointConfig;
+
+public class InputStreamDecoder implements Decoder.BinaryStream<InputStream>
+{
+    @Override
+    public InputStream decode(InputStream is) throws DecodeException, IOException
+    {
+        return is;
+    }
+
+    @Override
+    public void destroy()
+    {
+    }
+
+    @Override
+    public void init(EndpointConfig config)
+    {
+    }
+}

jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/PrimitiveDecoderMetadataSet.java

@@ -18,6 +18,8 @@
 
 package org.eclipse.jetty.websocket.jsr356.decoders;
 
+import java.io.InputStream;
+import java.io.Reader;
 import java.nio.ByteBuffer;
 
 import org.eclipse.jetty.websocket.jsr356.MessageType;
@@ -57,5 +59,12 @@ public class PrimitiveDecoderMetadataSet extends DecoderMetadataSet
         msgType = MessageType.BINARY;
         register(ByteBuffer.class,ByteBufferDecoder.class,msgType,streamed);
         register(byte[].class,ByteArrayDecoder.class,msgType,streamed);
+
+        // STREAMING based
+        streamed = true;
+        msgType = MessageType.TEXT;
+        register(Reader.class,ReaderDecoder.class,msgType,streamed);
+        msgType = MessageType.BINARY;
+        register(InputStream.class,InputStreamDecoder.class,msgType,streamed);
     }
 }