Index: jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/conversion/NameParser.java
===================================================================
--- jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/conversion/NameParser.java	(revision 785711)
+++ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/conversion/NameParser.java	Wed Aug 26 11:30:19 CEST 2009
@@ -119,6 +119,19 @@
             } else if (c == '}') {
                 if (state == STATE_URI_START || state == STATE_URI) {
                     String tmp = jcrName.substring(1, i);
+                    // avoid unneccessary ns lookups
+                    // (and potential server-roundtrips);
+                    // see JCR-2275
+                    if (jcrName.length() == i + 1
+                            || jcrName.charAt(i + 1) == ' ') {
+                        // neither "{foo}" nor "{foo} bar" are
+                        // legal expanded-form names;
+                        // apparently a localname starting with {
+                        state = STATE_NAME;
+                        nameStart = 0;
+                        trailingSpaces = false;
+                        continue;
+                    }
                     try {
                         // make sure the uri is a known namespace uri
                         // TODO: since namespace registration does not validate