You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2005/03/11 10:49:35 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method SearchMethod.java
luetzkendorf 2005/03/11 01:49:35
Modified: src/webdav/server/org/apache/slide/webdav/method
SearchMethod.java
Log:
fix: NPE with empty query
Revision Changes Path
1.51 +10 -6 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java
Index: SearchMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- SearchMethod.java 31 Oct 2004 11:32:39 -0000 1.50
+++ SearchMethod.java 11 Mar 2005 09:49:35 -0000 1.51
@@ -38,6 +38,7 @@
import org.apache.slide.search.QueryScope;
import org.apache.slide.search.RequestedResource;
import org.apache.slide.search.Search;
+import org.apache.slide.search.SearchException;
import org.apache.slide.search.SearchQuery;
import org.apache.slide.search.SearchQueryResult;
import org.apache.slide.search.basic.IBasicQuery;
@@ -262,19 +263,22 @@
*
* @version 12/28/2001
*/
- private Element getQueryElement() throws WebdavException, JDOMException {
+ private Element getQueryElement() throws WebdavException, JDOMException,
+ SearchException
+ {
Element queryElement = null;
try
{
Document document = parseRequestContent(); // TODO: check root element name
+ if (document == null) {
+ throw new BadQueryException("No search given.");
+ }
Element rootElement = document.getRootElement();
List children = rootElement.getChildren();
if (children.size() > 0) {
queryElement = (Element)children.get(0);
}
return queryElement;
-
-
}
catch (IOException e) {
System.err.println(e.getMessage());
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org