From 82b85e0519f204d339680434364267729ad9117c Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Wed, 25 Feb 2004 13:18:39 +0000
Subject: [PATCH] Avoid choking on null strings.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1402 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../samskivert/src/java/com/samskivert/util/StringUtil.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/samskivert/src/java/com/samskivert/util/StringUtil.java b/projects/samskivert/src/java/com/samskivert/util/StringUtil.java
index c075d1c3..cf95b998 100644
--- a/projects/samskivert/src/java/com/samskivert/util/StringUtil.java
+++ b/projects/samskivert/src/java/com/samskivert/util/StringUtil.java
@@ -1,5 +1,5 @@
 //
-// $Id: StringUtil.java,v 1.67 2003/12/17 19:19:25 ray Exp $
+// $Id: StringUtil.java,v 1.68 2004/02/25 13:18:39 mdb Exp $
 //
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001 Michael Bayne
@@ -725,7 +725,7 @@ public class StringUtil
     public static String encode (String s)
     {
         try {
-            return URLEncoder.encode(s, "UTF-8");
+            return (s != null) ? URLEncoder.encode(s, "UTF-8") : null;
         } catch (UnsupportedEncodingException uee) {
             throw new RuntimeException("UTF-8 is unknown in this Java.");
         }
@@ -737,7 +737,7 @@ public class StringUtil
     public static String decode (String s)
     {
         try {
-            return URLDecoder.decode(s, "UTF-8");
+            return (s != null) ? URLDecoder.decode(s, "UTF-8") : null;
         } catch (UnsupportedEncodingException uee) {
             throw new RuntimeException("UTF-8 is unknown in this Java.");
         }