aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [1/2] aries-rsa git commit: [ARIES-1623] Fix for inner class not matching pattern
Date Tue, 04 Oct 2016 17:04:30 GMT
Repository: aries-rsa
Updated Branches:
  refs/heads/master 475f01328 -> b2e1d8711


[ARIES-1623] Fix for inner class not matching pattern


Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/e41310ac
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/e41310ac
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/e41310ac

Branch: refs/heads/master
Commit: e41310ac80eabd13e249161f930512eb64a500b6
Parents: 475f013
Author: David Norris <Hillrunner2008@gmail.com>
Authored: Fri Jun 24 17:00:52 2016 -0400
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Tue Oct 4 19:02:36 2016 +0200

----------------------------------------------------------------------
 .../apache/aries/rsa/topologymanager/importer/FilterHelper.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/e41310ac/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/FilterHelper.java
----------------------------------------------------------------------
diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/FilterHelper.java
b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/FilterHelper.java
index 480ae46..77b0abb 100644
--- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/FilterHelper.java
+++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/FilterHelper.java
@@ -20,11 +20,10 @@ package org.apache.aries.rsa.topologymanager.importer;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.osgi.framework.Constants;
 
 public final class FilterHelper {
-    private static final String OBJECTCLASS_EXPRESSION = ".*\\(" + Constants.OBJECTCLASS
+ "=([a-zA-Z_0-9.]+)\\).*";
+    private static final String OBJECTCLASS_EXPRESSION = ".*\\(" + Constants.OBJECTCLASS
+ "=([^)]+)\\).*";
     private static final Pattern OBJECTCLASS_PATTERN = Pattern.compile(OBJECTCLASS_EXPRESSION);
 
     private FilterHelper() {


Mime
View raw message