You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2005/08/18 22:18:18 UTC
svn commit: r233371 - in
/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store: Path.java
Query.java
Author: cezar
Date: Thu Aug 18 13:18:15 2005
New Revision: 233371
URL: http://svn.apache.org/viewcvs?rev=233371&view=rev
Log:
Rename and NPE fix.
Modified:
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java?rev=233371&r1=233370&r2=233371&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Path.java Thu Aug 18 13:18:15 2005
@@ -35,7 +35,7 @@
{
public static String _useXqrlForXpath = "use xqrl for xpath";
public static String _useXbeanForXpath = "use xbean for xpath";
- public static String _useXqrl2002ForXpath = "use xqrl-2002 for xpath";
+ public static String _forceXqrl2002ForXpathXQuery = "use xqrl-2002 for xpath";
private static final int USE_XBEAN = 0x01;
private static final int USE_XQRL = 0x02;
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java?rev=233371&r1=233370&r2=233371&view=diff
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Query.java Thu Aug 18 13:18:15 2005
@@ -58,7 +58,7 @@
{
assert queryExpr != null;
- if (options.hasOption(Path._useXqrl2002ForXpath))
+ if (options!=null && options.hasOption(Path._forceXqrl2002ForXpathXQuery))
{
Query res = (Query)_xqrl2002QueryCache.get(queryExpr);
if (res!=null)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org