You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/11/25 16:52:00 UTC
svn commit: r1545327 -
/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java
Author: jbonofre
Date: Mon Nov 25 15:52:00 2013
New Revision: 1545327
URL: http://svn.apache.org/r1545327
Log:
Prevent NPE in SSH Karaf agent factory
Modified:
karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java
Modified: karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java?rev=1545327&r1=1545326&r2=1545327&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java (original)
+++ karaf/trunk/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java Mon Nov 25 15:52:00 2013
@@ -116,7 +116,7 @@ public class KarafAgentFactory implement
public void unregisterCommandSession(CommandSession session) {
try {
- if (session.get(SshAgent.SSH_AUTHSOCKET_ENV_NAME) != null) {
+ if (session != null && session.get(SshAgent.SSH_AUTHSOCKET_ENV_NAME) != null) {
String agentId = (String) session.get(SshAgent.SSH_AUTHSOCKET_ENV_NAME);
session.put(SshAgent.SSH_AUTHSOCKET_ENV_NAME, null);
if (agentId != null) {