Fixed NPE in minaio handler that can occur on close/cleanup. Also fix…

…ed NPE on rtmp encode if null message is passed.
Red5 · Oct 22, 2015 · 1e37366 · 1e37366
1 parent 2b3908f
commit 1e37366
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@ hs_err_pid*
 .settings
 target
 
+log
+
diff --git a/src/main/java/org/red5/server/net/rtmp/RTMPMinaIoHandler.java b/src/main/java/org/red5/server/net/rtmp/RTMPMinaIoHandler.java
@@ -260,16 +260,18 @@ public void operationComplete(CloseFuture future) {
 				future.removeListener(this);
 				for (Object key : session.getAttributeKeys()) {
 					Object obj = session.getAttribute(key);
-					log.debug("Attribute: {}", obj.getClass().getName());
-					if (obj instanceof IoProcessor) {
-						log.debug("Flushing session in processor");
-						((IoProcessor) obj).flush(session);
-						log.debug("Removing session from processor");
-						((IoProcessor) obj).remove(session);
-					} else if (obj instanceof IoBuffer) {
-						log.debug("Clearing session buffer");
-						((IoBuffer) obj).clear();
-						((IoBuffer) obj).free();
+					if (obj != null) {
+    					log.debug("Attribute: {}", obj.getClass().getName());
+    					if (obj instanceof IoProcessor) {
+    						log.debug("Flushing session in processor");
+    						((IoProcessor) obj).flush(session);
+    						log.debug("Removing session from processor");
+    						((IoProcessor) obj).remove(session);
+    					} else if (obj instanceof IoBuffer) {
+    						log.debug("Clearing session buffer");
+    						((IoBuffer) obj).clear();
+    						((IoBuffer) obj).free();
+    					}
 					}
 				}
 			}

diff --git a/src/main/java/org/red5/server/net/rtmp/codec/RTMPProtocolEncoder.java b/src/main/java/org/red5/server/net/rtmp/codec/RTMPProtocolEncoder.java
@@ -104,10 +104,19 @@ public class RTMPProtocolEncoder implements Constants, IEventEncoder {
 	 * @throws Exception    Any decoding exception
 	 */
 	public IoBuffer encode(Object message) throws Exception {
-		try {
-			return encodePacket((Packet) message);
-		} catch (Exception e) {
-			log.error("Error encoding", e);
+		if (message != null) {
+    		try {
+    			return encodePacket((Packet) message);
+    		} catch (Exception e) {
+    			log.error("Error encoding", e);
+    		}
+		} else if (log.isDebugEnabled()) {
+			try {
+				String callingMethod = Thread.currentThread().getStackTrace()[4].getMethodName();			
+				log.debug("Message is null at encode, expecting a Packet from: {}", callingMethod);
+			} catch (Throwable t) {
+				log.warn("Problem getting current calling method from stacktrace", t);
+			}
 		}
 		return null;
 	}