From d85fbdee04a52287feddf4bb628b0d48d16a2bc2 Mon Sep 17 00:00:00 2001
From: "A. Abram White" <awhite@apache.org>
Date: Sat, 9 Dec 2006 03:08:52 +0000
Subject: [PATCH] Fix calendar proxy bug.

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@484900 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/openjpa/util/ProxyManagerImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
index ed1c5980a..be652d4f8 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
@@ -214,7 +214,8 @@ public class ProxyManagerImpl
             type = GregorianCalendar.class;
         ProxyCalendar proxy = getFactoryProxyCalendar(type);
         ProxyCalendar cal = proxy.newInstance();
-        ((Calendar) cal).setTimeZone(zone);
+        if (zone != null)
+            ((Calendar) cal).setTimeZone(zone);
         return cal;
     }