[jboss-svn-commits] JBL Code SVN: r26937 - in labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm: struts and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2009-06-12 03:54:00 -0400 (Fri, 12 Jun 2009)
New Revision: 26937

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/RedirectNFToCSForumAction.java
Log:
catched exception and returned NOTFOUND result in case of not founded mapping

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java	2009-06-12 06:24:23 UTC (rev 26936)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java	2009-06-12 07:54:00 UTC (rev 26937)
@@ -463,12 +463,18 @@
       // case: /index.html?module=bb&op=viewtopic&t=150889
       if ("viewtopic".equals(op) && t != null) {
         Long threadID = getThreadID(t);
+        if (threadID == null) {
+          return null;
+        }
         return addContext("/thread/" + threadID + "?tstart=0");
       }
 
       // case: /index.html?module=bb&op=viewtopic&p=3915981
       if ("viewtopic".equals(op) && p != null) {
         Long messageID = getMessageID(p);
+        if (messageID == null) {
+          return null;
+        }
         return addContext("/message/" + messageID + "#" + messageID);
       }
     }
@@ -479,7 +485,11 @@
     Long threadID = topicMappings.get(topicID);
 
     if (threadID == null) {
+      try {
       threadID = nukesForumsMappingDAO.getTopicMapping(topicID);
+      } catch (EmptyResultDataAccessException e) {
+        return null;
+      }
       topicMappings.put(topicID, threadID);
     }
 
@@ -490,7 +500,11 @@
     Long messageID = postMappings.get(postID);
 
     if (messageID == null) {
-      messageID = nukesForumsMappingDAO.getPostMapping(postID);
+      try {
+        messageID = nukesForumsMappingDAO.getPostMapping(postID);
+      } catch (EmptyResultDataAccessException e) {
+        return null;
+      }
       postMappings.put(postID, messageID);
     }
 

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/RedirectNFToCSForumAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/RedirectNFToCSForumAction.java	2009-06-12 06:24:23 UTC (rev 26936)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/RedirectNFToCSForumAction.java	2009-06-12 07:54:00 UTC (rev 26937)
@@ -60,7 +60,7 @@
     url = nukesForumsManager.getCSForumsURL(module, op, c, f, t, p);
 
     if (url == null) {
-      return URL_NOT_DEFINED;
+      return NOTFOUND;
     }
 
     return SUCCESS;