You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/09/22 14:23:03 UTC
svn commit: r999905 - in /jackrabbit/branches/2.1: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java
Author: jukka
Date: Wed Sep 22 12:23:02 2010
New Revision: 999905
URL: http://svn.apache.org/viewvc?rev=999905&view=rev
Log:
2.1: Merged revision 950680 (JCR-888)
Modified:
jackrabbit/branches/2.1/ (props changed)
jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java
Propchange: jackrabbit/branches/2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 12:23:02 2010
@@ -2,4 +2,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:931121,931479,931483-931484,931504,931609,931613,931838,931919,932318-932319,933144,933197,933203,933213,933216,933554,933646,933694,934405,934412,934849,935557,936668,938099,945528,950440,955222,955229,955307,955852,961487,961626,964362,965539,986682,986686,986715,991144,996810
+/jackrabbit/trunk:931121,931479,931483-931484,931504,931609,931613,931838,931919,932318-932319,933144,933197,933203,933213,933216,933554,933646,933694,934405,934412,934849,935557,936668,938099,945528,950440,950680,955222,955229,955307,955852,961487,961626,964362,965539,986682,986686,986715,991144,996810
Modified: jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java?rev=999905&r1=999904&r2=999905&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java (original)
+++ jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java Wed Sep 22 12:23:02 2010
@@ -46,6 +46,17 @@ public class NamespaceRegistryImpl imple
private static Logger log = LoggerFactory.getLogger(NamespaceRegistryImpl.class);
+ /**
+ * Special property key string to be used instead of an empty key to
+ * avoid problems with Java implementations that have problems with
+ * empty keys in property files. The selected value ({@value}) would be
+ * invalid as either a namespace prefix or a URI, so there's little fear
+ * of accidental collisions.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/JCR-888">JCR-888</a>
+ */
+ private static final String EMPTY_KEY = ".empty.key";
+
private static final String NS_REG_RESOURCE = "ns_reg.properties";
private static final String NS_IDX_RESOURCE = "ns_idx.properties";
@@ -198,11 +209,15 @@ public class NamespaceRegistryImpl imple
for (Object p : props.keySet()) {
String prefix = (String) p;
String uri = props.getProperty(prefix);
- String idx = indexes.getProperty(uri);
+ String idx = indexes.getProperty(escapePropertyKey(uri));
+ // JCR-888: Backwards compatibility check
+ if (idx == null && uri.equals("")) {
+ idx = indexes.getProperty(uri);
+ }
if (idx != null) {
- map(prefix, uri, Integer.decode(idx));
+ map(unescapePropertyKey(prefix), uri, Integer.decode(idx));
} else {
- map(prefix, uri);
+ map(unescapePropertyKey(prefix), uri);
}
}
} finally {
@@ -229,7 +244,7 @@ public class NamespaceRegistryImpl imple
// store mappings in properties
for (String prefix : prefixToURI.keySet()) {
String uri = prefixToURI.get(prefix);
- props.setProperty(prefix, uri);
+ props.setProperty(escapePropertyKey(prefix), uri);
}
try {
@@ -254,7 +269,7 @@ public class NamespaceRegistryImpl imple
// store mappings in properties
for (String uri : uriToIndex.keySet()) {
String index = uriToIndex.get(uri).toString();
- props.setProperty(uri, index);
+ props.setProperty(escapePropertyKey(uri), index);
}
try {
@@ -271,6 +286,36 @@ public class NamespaceRegistryImpl imple
}
/**
+ * Replaces an empty string with the special {@link #EMPTY_KEY} value.
+ *
+ * @see #unescapePropertyKey(String)
+ * @param key property key
+ * @return escaped property key
+ */
+ private String escapePropertyKey(String key) {
+ if (key.equals("")) {
+ return EMPTY_KEY;
+ } else {
+ return key;
+ }
+ }
+
+ /**
+ * Converts the special {@link #EMPTY_KEY} value back to an empty string.
+ *
+ * @see #escapePropertyKey(String)
+ * @param key property key
+ * @return escaped property key
+ */
+ private String unescapePropertyKey(String key) {
+ if (key.equals(EMPTY_KEY)) {
+ return "";
+ } else {
+ return key;
+ }
+ }
+
+ /**
* Set an event channel to inform about changes.
*
* @param eventChannel event channel