Changeset 4288

Timestamp:

01/20/14 10:47:23 (10 years ago)

Author:

twagoo

Message:

Prevented potential NPE in ShowResultPage? when docId not specified

File:

• vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (2 diffs)

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -61 +61 @@
 import org.apache.wicket.util.encoding.UrlDecoder;
 import org.apache.wicket.util.encoding.UrlEncoder;
+import org.apache.wicket.util.string.StringValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81 +82 @@
     public ShowResultPage(final PageParameters currentParam) {
         super(currentParam);
+        
+        final StringValue docIdParam = getPageParameters().get(PARAM_DOC_ID);
+        if (docIdParam == null) {
+            throw new RuntimeException("No document id was specified. Cannot construct result page.");
+        }
         //Document ID is assumed to have been encoded (typcially in DocumentLinkPanel) decode here
         final String docId = UrlDecoder.QUERY_INSTANCE.decode(
-                getPageParameters().get(PARAM_DOC_ID).toString(),
+                docIdParam.toString(),
                 Application.get().getRequestCycleSettings().getResponseRequestEncoding()); // get current character set from request cycle
         SolrDocument solrDocument = DaoLocator.getSearchResultsDao().getSolrDocument(docId);
+        
         if (solrDocument != null) {
             final SearchPageQuery query = new SearchPageQuery(currentParam);