From 524aeb7676fce7238d8d70706ffbb94d3fd23499 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 7 Feb 2011 19:09:49 +0000
Subject: [PATCH] Correct logical expression to avoid throwing a
 NullPointerException on a null input.

---
 .../src/edu/cornell/mannlib/vitro/webapp/utils/TitleCase.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/TitleCase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/TitleCase.java
index 418079102..9a82ef919 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/TitleCase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/TitleCase.java
@@ -42,7 +42,7 @@ public class TitleCase {
             "to","of","by","at","for","but","in","with","has","de","von"};
 
     public static String toTitleCase(String in){
-        if( in == null && in.length() ==0 )
+        if( in == null || in.length() ==0 )
             return in;
 
         in = in.toLowerCase();
@@ -80,7 +80,7 @@ public class TitleCase {
     }
 
     private static String capitalizeWord(String in){
-        if( in == null && in.length() == 0 )
+        if( in == null || in.length() == 0 )
             return in;
         if( in.length() == 1 )
             return in.toUpperCase();