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/04/03 08:39:07 UTC
[1/3] karaf git commit: [KARAF-5079] Log:tail does not print messages
steadily
Repository: karaf
Updated Branches:
refs/heads/master 37827b5f5 -> fa3828bba
[KARAF-5079] Log:tail does not print messages steadily
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4f18c5b9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4f18c5b9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4f18c5b9
Branch: refs/heads/master
Commit: 4f18c5b96c8e561e2a4eb7500917884a7d352864
Parents: 37827b5
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Apr 3 10:01:31 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Apr 3 10:01:31 2017 +0200
----------------------------------------------------------------------
log/src/main/java/org/apache/karaf/log/command/LogTail.java | 6 +++++-
.../main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/4f18c5b9/log/src/main/java/org/apache/karaf/log/command/LogTail.java
----------------------------------------------------------------------
diff --git a/log/src/main/java/org/apache/karaf/log/command/LogTail.java b/log/src/main/java/org/apache/karaf/log/command/LogTail.java
index 6e3fe23..516a3c3 100644
--- a/log/src/main/java/org/apache/karaf/log/command/LogTail.java
+++ b/log/src/main/java/org/apache/karaf/log/command/LogTail.java
@@ -41,7 +41,7 @@ public class LogTail extends DisplayLog {
@Reference
LogService logService;
- private ExecutorService executorService = Executors.newSingleThreadExecutor();
+ private ExecutorService executorService = Executors.newFixedThreadPool(2);
@Override
public Object execute() throws Exception {
@@ -100,6 +100,7 @@ public class LogTail extends DisplayLog {
for (PaxLoggingEvent event : le) {
printEvent(out, event, minLevel);
}
+ out.flush();
// Tail
final BlockingQueue<PaxLoggingEvent> queue = new LinkedBlockingQueue<PaxLoggingEvent>();
PaxAppender appender = new PaxAppender() {
@@ -111,6 +112,9 @@ public class LogTail extends DisplayLog {
logService.addAppender(appender);
while (doDisplay) {
printEvent(out, queue.take(), minLevel);
+ if (queue.isEmpty()) {
+ out.flush();
+ }
}
} catch (InterruptedException e) {
// Ignore
http://git-wip-us.apache.org/repos/asf/karaf/blob/4f18c5b9/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
index 07a63f7..364bafe 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
@@ -98,8 +98,8 @@ public class ShellFactoryImpl implements Factory<Command> {
final Subject subject = ShellImpl.this.session != null ? ShellImpl.this.session
.getAttribute(KarafJaasAuthenticator.SUBJECT_ATTRIBUTE_KEY) : null;
String encoding = getEncoding(env);
- final PrintStream pout = out instanceof PrintStream ? (PrintStream) out : new PrintStream(out, false, encoding);
- final PrintStream perr = err instanceof PrintStream ? (PrintStream) err : out == err ? pout : new PrintStream(err, false, encoding);
+ final PrintStream pout = out instanceof PrintStream ? (PrintStream) out : new PrintStream(out, true, encoding);
+ final PrintStream perr = err instanceof PrintStream ? (PrintStream) err : out == err ? pout : new PrintStream(err, true, encoding);
terminal = new SshTerminal(env, in, pout);
shell = sessionFactory.create(in,
pout, perr, terminal, encoding, this::destroy);
[3/3] karaf git commit: [KARAF-5081] Fix problem with resource
extraction from kar files
Posted by gn...@apache.org.
[KARAF-5081] Fix problem with resource extraction from kar files
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fa3828bb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fa3828bb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fa3828bb
Branch: refs/heads/master
Commit: fa3828bbab6d23997092547a7540b5b520c00a0d
Parents: 689616a
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Apr 3 10:38:57 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Apr 3 10:38:57 2017 +0200
----------------------------------------------------------------------
kar/src/main/java/org/apache/karaf/kar/internal/Kar.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/fa3828bb/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
----------------------------------------------------------------------
diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
index c2a8dd5..601d97f 100644
--- a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
@@ -115,7 +115,7 @@ public class Kar {
ZipEntry entry = zipIs.getNextEntry();
while (entry != null) {
- if (entry.getName().startsWith("repository")) {
+ if (entry.getName().startsWith("repository/")) {
String path = entry.getName().substring("repository/".length());
File destFile = new File(repoDir, path);
extract(zipIs, entry, destFile);
@@ -128,8 +128,8 @@ public class Kar {
}
}
- if (entry.getName().startsWith("resource")) {
- String path = entry.getName().substring("resource/".length());
+ if (entry.getName().startsWith("resources/")) {
+ String path = entry.getName().substring("resources/".length());
File destFile = new File(resourceDir, path);
extract(zipIs, entry, destFile);
}
[2/3] karaf git commit: [KARAF-5016] Fix another possible NPE
Posted by gn...@apache.org.
[KARAF-5016] Fix another possible NPE
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/689616a7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/689616a7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/689616a7
Branch: refs/heads/master
Commit: 689616a7680a0746ce0cbd8a28ff7661ba3ed0de
Parents: 4f18c5b
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Apr 3 10:23:20 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Apr 3 10:23:20 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/log/core/internal/layout/PatternParser.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/689616a7/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java
----------------------------------------------------------------------
diff --git a/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java b/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java
index a3abad8..5e26d13 100644
--- a/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java
+++ b/log/src/main/java/org/apache/karaf/log/core/internal/layout/PatternParser.java
@@ -480,6 +480,8 @@ public class PatternParser {
public
String convert(PaxLoggingEvent event) {
String n = getFullyQualifiedName(event);
+ if (n == null)
+ return null;
if(precision <= 0)
return n;
else {