[Bigdata-commit] SF.net SVN: bigdata:[7488] branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src /java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java

[<tho...@us...>]

Revision: 7488
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7488&view=rev
Author:   thompsonbry
Date:     2013-10-28 19:16:50 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
Handled possible NPE (queryId2 is not defined in the constructor and so it can be null in the finally clause).

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java	2013-10-28 15:23:15 UTC (rev 7487)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java	2013-10-28 19:16:50 UTC (rev 7488)
@@ -1093,7 +1093,7 @@
             } finally {
                 endNanos = System.nanoTime();
                 m_queries.remove(queryId);
-                m_queries2.remove(queryId2);
+                if (queryId2 != null) m_queries2.remove(queryId2);
 //                if (os != null) {
 //                    try {
 //                        os.close();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.