You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/09/22 15:56:45 UTC
[1/2] karaf git commit: Avoid possible error message in the console
Repository: karaf
Updated Branches:
refs/heads/master 56718ec70 -> 262e9cb17
Avoid possible error message in the console
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dcfa79db
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dcfa79db
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dcfa79db
Branch: refs/heads/master
Commit: dcfa79db987f4d292e07780dd18dba1550f9f72e
Parents: 56718ec
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Fri Sep 22 15:42:55 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Sep 22 15:42:55 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dcfa79db/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
index f1a0772..d4fd7ba 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
@@ -386,7 +386,9 @@ public class ConsoleSessionImpl implements Session {
if (command == null) {
break;
}
- doExecute(command);
+ if (command.length() > 0) {
+ doExecute(command);
+ }
}
close();
} finally {
[2/2] karaf git commit: [KARAF-5359] Upgrade to JLine 3.5.1
Posted by gn...@apache.org.
[KARAF-5359] Upgrade to JLine 3.5.1
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/262e9cb1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/262e9cb1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/262e9cb1
Branch: refs/heads/master
Commit: 262e9cb1747882e2dfa8cc593f3170b274ac3b30
Parents: dcfa79d
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Fri Sep 22 15:44:27 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Sep 22 15:44:27 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/262e9cb1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ffc845..5572e73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,7 +258,7 @@
<hibernate.validator.version>5.3.4.Final</hibernate.validator.version>
<jansi.version>1.16</jansi.version>
<javassist.version>3.9.0.GA</javassist.version>
- <jline.version>3.5.0</jline.version>
+ <jline.version>3.5.1</jline.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>
<maven.version>3.5.0</maven.version>