Bläddra i källkod

Avoid NullPointerException in WaitForSupportedAppProtocolRes.java

Marc Mültin 8 år sedan
förälder
incheckning
1cda643223

+ 3 - 2
RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSupportedAppProtocolRes.java

@@ -99,8 +99,9 @@ public class WaitForSupportedAppProtocolRes extends ClientState {
 					TimeRestrictions.V2G_EVCC_COMMUNICATION_SETUP_TIMEOUT - elapsedTimeInMs
 					));
 		} else {
-			return new TerminateSession("Invalid message (" + message.getClass().getSimpleName() + 
-	  		  		  					") at this state (" + this.getClass().getSimpleName() + ")");
+			String className = (message != null) ? message.getClass().getSimpleName() : "<unkown message type>";
+			
+			return new TerminateSession("Invalid message (" + className + ") at this state (" + this.getClass().getSimpleName() + ")");
 		}
 	}
 }