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 2015/04/13 08:35:33 UTC

[1/2] karaf git commit: [KARAF-3660] Setting JMX SSL causes StringIndexOutOfBoundsException when setting keyPasswords without = symbol

Repository: karaf
Updated Branches:
  refs/heads/master 2d883a36a -> 49a06cce5


[KARAF-3660] Setting JMX SSL causes StringIndexOutOfBoundsException when setting keyPasswords without = symbol


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0299a613
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0299a613
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0299a613

Branch: refs/heads/master
Commit: 0299a613082ea5231e81b6f48c7c3c048c592243
Parents: d397796
Author: Jay SenSharma <jo...@gmail.com>
Authored: Sun Apr 12 16:04:45 2015 +0530
Committer: Jay SenSharma <jo...@gmail.com>
Committed: Sun Apr 12 16:59:28 2015 +0530

----------------------------------------------------------------------
 .../apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/0299a613/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java
----------------------------------------------------------------------
diff --git a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java
index f2c7260..9ced5fa 100644
--- a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java
+++ b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java
@@ -130,7 +130,9 @@ public class ResourceKeystoreInstance implements KeystoreInstance {
             for (int i = 0; i < keys.length; i++) {
                 String key = keys[i];
                 int pos = key.indexOf('=');
-                this.keyPasswords.put(key.substring(0, pos), key.substring(pos + 1).toCharArray());
+                if (pos > 0) {
+                    this.keyPasswords.put(key.substring(0, pos), key.substring(pos + 1).toCharArray());
+                }
             }
         }
     }


[2/2] karaf git commit: Merge branch 'KARAF-3660' of https://github.com/jaysensharma/karaf-1

Posted by jb...@apache.org.
Merge branch 'KARAF-3660' of https://github.com/jaysensharma/karaf-1


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/49a06cce
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/49a06cce
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/49a06cce

Branch: refs/heads/master
Commit: 49a06cce56c7cc032770f30a9336103ecba83b1b
Parents: 2d883a3 0299a61
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Apr 13 07:59:28 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Apr 13 07:59:28 2015 +0200

----------------------------------------------------------------------
 .../apache/karaf/jaas/config/impl/ResourceKeystoreInstance.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------