Revision: 14610
http://gate.svn.sourceforge.net/gate/?rev=14610&view=rev
Author: valyt
Date: 2011-11-25 13:20:12 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
More NPE guards. New grails app version.
Modified Paths:
--------------
mimir/branches/3.4/mimir-cloud/application.properties
mimir/branches/3.4/mimir-core/src/gate/mimir/search/query/AnnotationQuery.java
mimir/branches/3.4/mimir-core/src/gate/mimir/search/query/OrQuery.java
Modified: mimir/branches/3.4/mimir-cloud/application.properties
===================================================================
--- mimir/branches/3.4/mimir-cloud/application.properties 2011-11-25
12:59:58 UTC (rev 14609)
+++ mimir/branches/3.4/mimir-cloud/application.properties 2011-11-25
13:20:12 UTC (rev 14610)
@@ -3,7 +3,7 @@
app.grails.version=1.3.7
app.name=mimir-cloud
app.servlet.version=2.4
-app.version=1.0-20111114
+app.version=1.0-20111125
plugins.background-thread=1.6
plugins.hibernate=1.3.7
plugins.spring-security-core=1.2.4
Modified:
mimir/branches/3.4/mimir-core/src/gate/mimir/search/query/AnnotationQuery.java
===================================================================
---
mimir/branches/3.4/mimir-core/src/gate/mimir/search/query/AnnotationQuery.java
2011-11-25 12:59:58 UTC (rev 14609)
+++
mimir/branches/3.4/mimir-core/src/gate/mimir/search/query/AnnotationQuery.java
2011-11-25 13:20:12 UTC (rev 14610)
@@ -135,7 +135,7 @@
*/
public void close() throws IOException {
super.close();
- underlyingExecutor.close();
+ if(underlyingExecutor != null) underlyingExecutor.close();
}
/* (non-Javadoc)
Modified: mimir/branches/3.4/mimir-core/src/gate/mimir/search/query/OrQuery.java
===================================================================
--- mimir/branches/3.4/mimir-core/src/gate/mimir/search/query/OrQuery.java
2011-11-25 12:59:58 UTC (rev 14609)
+++ mimir/branches/3.4/mimir-core/src/gate/mimir/search/query/OrQuery.java
2011-11-25 13:20:12 UTC (rev 14610)
@@ -103,7 +103,7 @@
*/
public void close() throws IOException {
super.close();
- executors.close();
+ if(executors != null) executors.close();
executors = null;
hitsOnCurrentDocument.clear();
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
