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 2017/09/07 12:50:47 UTC

karaf git commit: [KARAF-5328] Fix NullPointerException when client/ssh execute source command

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.1.x 1e88deab1 -> adfdae1f5


[KARAF-5328] Fix NullPointerException when client/ssh execute source command


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/adfdae1f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/adfdae1f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/adfdae1f

Branch: refs/heads/karaf-4.1.x
Commit: adfdae1f5902352b7ad1c3db54c7e3ce715724fa
Parents: 1e88dea
Author: Xilai Dai <xl...@talend.com>
Authored: Wed Sep 6 11:07:48 2017 +0800
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Sep 7 14:38:15 2017 +0200

----------------------------------------------------------------------
 .../org/apache/karaf/shell/impl/console/HeadlessSessionImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/adfdae1f/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HeadlessSessionImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HeadlessSessionImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HeadlessSessionImpl.java
index e82f6f0..cc2f6a7 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HeadlessSessionImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/HeadlessSessionImpl.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Properties;
@@ -79,7 +80,7 @@ public class HeadlessSessionImpl implements Session {
             session.put("USER", ShellUtil.getCurrentUserName());
             session.put("APPLICATION", System.getProperty("karaf.name", "root"));
         }
-        session.currentDir(null);
+        session.currentDir(Paths.get(System.getProperty("user.dir")).toAbsolutePath().normalize());
     }
 
     public CommandSession getSession() {