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/03/27 04:42:49 UTC
[1/3] karaf git commit: [KARAF-5003] Fix contextPath trim in
WebContainer
Repository: karaf
Updated Branches:
refs/heads/karaf-4.0.x 5dfd9b94b -> ae675c9a4
[KARAF-5003] Fix contextPath trim in WebContainer
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e03fcf9d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e03fcf9d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e03fcf9d
Branch: refs/heads/karaf-4.0.x
Commit: e03fcf9da99ec24b39d22656b4762ac03a489757
Parents: 5dfd9b9
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Sun Mar 26 07:39:55 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Sun Mar 26 07:40:30 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/web/internal/WebContainerServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/e03fcf9d/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
----------------------------------------------------------------------
diff --git a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
index bab1bdd..c3a81ed 100644
--- a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
+++ b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
@@ -82,7 +82,7 @@ public class WebContainerServiceImpl implements WebContainerService, BundleListe
}
WebBundle webBundle = new WebBundle();
- contextPath.trim();
+ contextPath = contextPath.trim();
// get the bundle name
String name = (String) bundle.getHeaders().get(Constants.BUNDLE_NAME);
[2/3] karaf git commit: [KARAF-5003] Fix table exists checked twice
in JDBC lock
Posted by jb...@apache.org.
[KARAF-5003] Fix table exists checked twice in JDBC lock
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cd601e41
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cd601e41
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cd601e41
Branch: refs/heads/karaf-4.0.x
Commit: cd601e41c8e8af5e8a97a251f0260be901faf957
Parents: e03fcf9
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Sun Mar 26 07:50:07 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Sun Mar 26 07:51:10 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/cd601e41/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java b/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
index 5f44b10..806835b 100644
--- a/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
+++ b/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
@@ -158,8 +158,7 @@ public class DefaultJDBCLock implements Lock {
boolean schemaExist(String tableName) {
try {
DatabaseMetaData metadata = getConnection().getMetaData();
- return metadata != null && (checkTableExists(tableName.toLowerCase(), metadata) //
- || checkTableExists(tableName.toLowerCase(), metadata));
+ return metadata != null && (checkTableExists(tableName.toLowerCase(), metadata));
} catch (Exception ignore) {
return false;
//throw new RuntimeException("Error testing for db table", ignore);
[3/3] karaf git commit: [KARAF-5003] Fix test in JDBC lock
Posted by jb...@apache.org.
[KARAF-5003] Fix test in JDBC lock
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ae675c9a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ae675c9a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ae675c9a
Branch: refs/heads/karaf-4.0.x
Commit: ae675c9a488cdc1921eca8350f56f8fdaa001968
Parents: cd601e4
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Mon Mar 27 06:16:13 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Mar 27 06:35:06 2017 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ae675c9a/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java
----------------------------------------------------------------------
diff --git a/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java b/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java
index d4d697e..76776d9 100644
--- a/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java
+++ b/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java
@@ -90,8 +90,6 @@ public abstract class BaseJDBCLockTest {
connection.setAutoCommit(false);
expect(connection.getMetaData()).andReturn(metaData).anyTimes();
expect(metaData.getTables((String) isNull(), (String) isNull(), anyString(), aryEq(new String[]{"TABLE"}))).andReturn(resultSet);
- expect(metaData.getTables((String) isNull(), (String) isNull(), anyString(), aryEq(new String[]{"TABLE"}))).andReturn(resultSet);
- expect(resultSet.next()).andReturn(false);
expect(resultSet.next()).andReturn(false);
resultSet.close();
expectLastCall().atLeastOnce();