[freenet-cvs] r12851 - trunk/freenet/src/freenet/clients/http

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-22 00:37:23 +0000 (Sun, 22 Apr 2007)
New Revision: 12851

Modified:
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
Fix a potential NPE... handle wisely the fact that no custom translation is 
available.

Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-04-22 
00:09:35 UTC (rev 12850)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-04-22 
00:37:23 UTC (rev 12851)
@@ -30,6 +30,7 @@
 import freenet.support.HTMLNode;
 import freenet.support.Logger;
 import freenet.support.MultiValueTable;
+import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 import freenet.support.api.HTTPRequest;

@@ -471,7 +472,12 @@
                                ctx.writeData(data);
                                return;
                        } else if 
(request.isParameterSet("getOverrideTranlationFile")) {
-                               byte[] data = 
L10n.getOverrideForCurrentLanguageTranslation().toOrderedString().getBytes("UTF-8");
+                               SimpleFieldSet sfs = 
L10n.getOverrideForCurrentLanguageTranslation();
+                               if(sfs == null) {
+                                       super.sendErrorPage(ctx, 503 /* Service 
Unavailable */, "Service Unavailable", "There is no custom translation 
available.");
+                                       return;
+                               }
+                               byte[] data = 
sfs.toOrderedString().getBytes("UTF-8");
                                MultiValueTable head = new MultiValueTable();
                                head.put("Content-Disposition", "attachment; 
filename=\"" + L10n.PREFIX +L10n.getSelectedLanguage()+ L10n.OVERRIDE_SUFFIX + 
'"');
                                ctx.sendReplyHeaders(200, "Found", head, 
"text/plain", data.length);