From 3ef365ba4cad8085612cf98514cce0a627b13d8d Mon Sep 17 00:00:00 2001 From: mdb Date: Fri, 30 Apr 2004 02:38:10 +0000 Subject: [PATCH] Cope gracefully with nulls. git-svn-id: https://samskivert.googlecode.com/svn/trunk@1422 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../samskivert/src/java/com/samskivert/jdbc/JDBCUtil.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/projects/samskivert/src/java/com/samskivert/jdbc/JDBCUtil.java b/projects/samskivert/src/java/com/samskivert/jdbc/JDBCUtil.java index 6ae6cb0d..d42cfdfb 100644 --- a/projects/samskivert/src/java/com/samskivert/jdbc/JDBCUtil.java +++ b/projects/samskivert/src/java/com/samskivert/jdbc/JDBCUtil.java @@ -1,5 +1,5 @@ // -// $Id: JDBCUtil.java,v 1.6 2004/04/26 02:43:35 mdb Exp $ +// $Id: JDBCUtil.java,v 1.7 2004/04/30 02:38:10 mdb Exp $ // // samskivert library - useful routines for java programs // Copyright (C) 2001 Michael Bayne @@ -138,6 +138,9 @@ public class JDBCUtil */ public static String jigger (String text) { + if (text == null) { + return null; + } try { return new String(text.getBytes("UTF8"), "8859_1"); } catch (UnsupportedEncodingException uee) { @@ -151,6 +154,9 @@ public class JDBCUtil */ public static String unjigger (String text) { + if (text == null) { + return null; + } try { return new String(text.getBytes("8859_1"), "UTF8"); } catch (UnsupportedEncodingException uee) {