You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/01/10 15:26:38 UTC
[2/3] git commit: KARAF-2678 - txlog files locked during admin clone
on windows
KARAF-2678 - txlog files locked during admin clone on windows
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bb3ac068
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bb3ac068
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bb3ac068
Branch: refs/heads/karaf-2.3.x
Commit: bb3ac068d597cfede34191cfb66ead9c0a074517
Parents: d3b0506
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Jan 10 10:46:38 2014 -0330
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Jan 10 10:47:28 2014 -0330
----------------------------------------------------------------------
.../java/org/apache/karaf/admin/internal/AdminServiceImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bb3ac068/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
----------------------------------------------------------------------
diff --git a/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java b/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
index 05654a0..4dc026d 100644
--- a/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
+++ b/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
@@ -995,6 +995,10 @@ public class AdminServiceImpl implements AdminService {
// ignore lock file
return;
}
+ if (source.getName().matches("transaction_\\d+\\.log")) {
+ // ignore active txlog files
+ return;
+ }
if (source.isDirectory()) {
if (!destination.exists()) {
destination.mkdirs();