karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [karaf] branch master updated: [KARAF-5461]incorrect filter in EncryptionSupport of jaas modules
Date Mon, 06 Nov 2017 02:34:42 GMT
This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 2e420da  [KARAF-5461]incorrect filter in EncryptionSupport of jaas modules
2e420da is described below

commit 2e420daa66a00eb829a6ef5ecab7f451ee2401d7
Author: Freeman Fang <freeman.fang@gmail.com>
AuthorDate: Mon Nov 6 10:34:31 2017 +0800

    [KARAF-5461]incorrect filter in EncryptionSupport of jaas modules
---
 .../org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
index 61e28f0..49a3154 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/encryption/EncryptionSupport.java
@@ -150,7 +150,7 @@ public class EncryptionSupport {
     private org.osgi.framework.Filter getFilter() {
         String nameFilter = name != null && name.length() > 0 ? "(name=" + name
+ ")" : null;
         String objFilter = "(objectClass=" + EncryptionService.class.getName() + ")";
-        String filter = nameFilter == null ? objFilter : "&(" + nameFilter + objFilter
+ ")"; 
+        String filter = nameFilter == null ? objFilter : "(&" + nameFilter + objFilter
+ ")"; 
         try {
             return FrameworkUtil.createFilter(filter);
         } catch (InvalidSyntaxException e) {

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <commits@karaf.apache.org>'].

Mime
View raw message