db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1605285 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java
Date Wed, 25 Jun 2014 07:58:05 GMT
Author: kahatlen
Date: Wed Jun 25 07:58:04 2014
New Revision: 1605285

URL: http://svn.apache.org/r1605285
Log:
DERBY-6634: Improve test coverage of SqlXmlUtil.java

Remove dead code from the time when SqlXmlUtil implemented the
Formatable interface (before DERBY-3870).

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java?rev=1605285&r1=1605284&r2=1605285&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java Wed Jun 25
07:58:04 2014
@@ -128,12 +128,6 @@ public class SqlXmlUtil
     /** The return type of the XPath query. {@code null} if it is unknown. */
     private QName returnType;
 
-    // Used to recompile the XPath expression when this formatable
-    // object is reconstructed.  e.g.:  SPS 
-    private String queryExpr;
-    private String opName;
-    private boolean recompileQuery;
-
     /**
      * Constructor: Initializes objects required for parsing
      * and serializing XML values.  Since most XML operations
@@ -266,10 +260,6 @@ public class SqlXmlUtil
 
             query = xpath.compile(queryExpr);
 
-            this.queryExpr = queryExpr;
-            this.opName = opName;
-            this.recompileQuery = false;
-
         } catch (Throwable te) {
 
             /* Something went wrong during compilation of the
@@ -552,12 +542,6 @@ public class SqlXmlUtil
     protected List evalXQExpression(XMLDataValue xmlContext,
         boolean returnResults, int [] resultXType) throws Exception
     {
-        // if this object is in an SPS, we need to recompile the query
-        if (recompileQuery)
-        {
-        	compileXQExpr(queryExpr, opName);
-        }
-
         // Make sure we have a compiled query.
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(



Mime
View raw message