You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2017/07/10 06:53:36 UTC

[34/50] polygene-java git commit: Stanislav correctly identified a new regexp to be used.

Stanislav correctly identified a new regexp to be used.


Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c9d8c249
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c9d8c249
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c9d8c249

Branch: refs/heads/es-jooq
Commit: c9d8c249642d6edb2ea29409a462a25ff0efc9cb
Parents: 8393d86
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 09:48:37 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 09:48:37 2017 +0800

----------------------------------------------------------------------
 .../index/sql/support/skeletons/AbstractSQLStartup.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9d8c249/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java
index e2d2cc6..6a8aa12 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java
@@ -1654,9 +1654,14 @@ public abstract class AbstractSQLStartup
         + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END )
         + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_START ) + "(.*)"
         + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END )
-        + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_START ) + "(" + "[^"
+        + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_START )
+        + "([^"
         + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END + DESCRIPTOR_TYPE_SEPARATOR )
-        + "]+)" + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END ) + "$" );
+        + "]+)"
+        + "(,[^"
+        + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END + DESCRIPTOR_TYPE_SEPARATOR )
+        + "]+)*"
+        + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END ) + "$" );
 
     protected static String compositeDescriptorToString( LayerDescriptor layer,
                                                          ModuleDescriptor module, CompositeDescriptor descriptor )