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:39 UTC
[3/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/3f5e31da
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3f5e31da
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3f5e31da
Branch: refs/heads/master
Commit: 3f5e31dacb8a3bb107530007a1b8cd1002b1fa98
Parents: 9fb3571
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Jan 10 10:56:08 2014 -0330
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Jan 10 10:56:08 2014 -0330
----------------------------------------------------------------------
.../apache/karaf/instance/core/internal/InstanceServiceImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f5e31da/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
----------------------------------------------------------------------
diff --git a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index 0bfd6e1..ba99b75 100644
--- a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -1020,6 +1020,10 @@ public class InstanceServiceImpl implements InstanceService {
// ignore lock file
return;
}
+ if (source.getName().matches("transaction_\\d+\\.log")) {
+ // ignore active txlog files
+ return;
+ }
if (source.isDirectory()) {
if (!destination.exists()) {
destination.mkdirs();