diff options
Diffstat (limited to 'demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java')
| -rw-r--r-- | demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java index 3b389d09..81cec2ce 100644 --- a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java +++ b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java @@ -103,7 +103,7 @@ public class PhoneNumberParserServlet extends HttpServlet { StringBuilder output; resp.setContentType("text/html"); resp.setCharacterEncoding(UTF_8.name()); - if (fileContents.length() == 0) { + if (fileContents == null || fileContents.length() == 0) { // Redirect to a URL with the given input encoded in the query parameters. Locale geocodingLocale = new Locale(languageCode, regionCode); resp.sendRedirect(getPermaLinkURL(phoneNumber, defaultCountry, geocodingLocale, @@ -195,8 +195,9 @@ public class PhoneNumberParserServlet extends HttpServlet { StringBuilder permaLink = new StringBuilder( absoluteURL ? "http://libphonenumber.appspot.com/phonenumberparser" : "/phonenumberparser"); try { - permaLink.append("?number=" + URLEncoder.encode(phoneNumber, UTF_8.name())); - if (!defaultCountry.isEmpty()) { + permaLink.append( + "?number=" + URLEncoder.encode(phoneNumber != null ? phoneNumber : "", UTF_8.name())); + if (defaultCountry != null && !defaultCountry.isEmpty()) { permaLink.append("&country=" + URLEncoder.encode(defaultCountry, UTF_8.name())); } if (!geocodingLocale.getLanguage().equals(ENGLISH.getLanguage()) || |