[freenet-cvs] r13999 - trunk/plugins/Echo/src/plugins/echo

[f...@freenetproject.org]

Author: fred
Date: 2007-07-08 20:05:12 +0000 (Sun, 08 Jul 2007)
New Revision: 13999

Modified:
   trunk/plugins/Echo/src/plugins/echo/Echo.java
   trunk/plugins/Echo/src/plugins/echo/NodesManager.java
Log:
dont catch NullPointerException

Modified: trunk/plugins/Echo/src/plugins/echo/Echo.java
===================================================================
--- trunk/plugins/Echo/src/plugins/echo/Echo.java       2007-07-08 19:57:55 UTC 
(rev 13998)
+++ trunk/plugins/Echo/src/plugins/echo/Echo.java       2007-07-08 20:05:12 UTC 
(rev 13999)
@@ -134,10 +134,11 @@
                                try {

                                        node = nodesManager.getNodeById(nodeId);
-                                       page.appendData(node.getRoot());
+                                       if(node == null)
+                                               page.appendError("The node " + 
nodeId + "does not exist");
+                                       else
+                                               page.appendData(node.getRoot());

-                               } catch (NullPointerException npe) {
-                                       page.appendError("The node " + nodeId + 
"does not exist");
                                } catch (IOException ioe) {
                                        page.appendError(ioe.getMessage());
                                } catch (ParsingException pe) {
@@ -200,16 +201,18 @@
                        page = new Page();

                        if(request.isPartSet("confirmdelete") || 
request.isPartSet("cancel")) {
-                               try {
-                                       if(request.isPartSet("confirmdelete"))
-                                               
nodesManager.deleteNode(request.getPartAsString("node-id", MAX_ID_LENGTH));
-                                       
-                               } catch (NullPointerException npe) {
-                                       // Va foutre
+
+                               setDefaultPage();
+                               
+                               if(request.isPartSet("confirmdelete")) {
+                                       String nodeId = 
request.getPartAsString("node-id", MAX_ID_LENGTH);
+
+                                       if(nodesManager.nodeExists(nodeId))
+                                               nodesManager.deleteNode(nodeId);
+                                       else
+                                               page.appendError("The node " + 
nodeId + "does not exist");
                                }

-                               setDefaultPage();
-                               
                        } else {

                                String title = request.getPartAsString("title", 
MAX_TITLE_LENGTH).trim();

Modified: trunk/plugins/Echo/src/plugins/echo/NodesManager.java
===================================================================
--- trunk/plugins/Echo/src/plugins/echo/NodesManager.java       2007-07-08 
19:57:55 UTC (rev 13998)
+++ trunk/plugins/Echo/src/plugins/echo/NodesManager.java       2007-07-08 
20:05:12 UTC (rev 13999)
@@ -35,6 +35,9 @@
        public Node getNodeById(String nodeId) throws IOException, 
ParsingException {

                File file = nodes.get(nodeId);
+               if(file == null)
+                       return null;
+               
                return new Node(parser.build(file));

        }