lib/time_ext.rb in gdata-jruby-client-0.7.4 vs lib/time_ext.rb in gdata-jruby-client-0.7.5

@@ -10,10 +10,12 @@
   alias_method :to_gdata, :to_joda_time
   alias_method :to_date_time, :to_joda_time
   
   class << self
     def from_joda_time(gdatetime)
-      if defined? parse
+      if defined? Time.zone
+        Time.zone.parse(gdatetime.to_s)
+      elsif defined? parse
         self.parse(gdatetime.to_s)
       else
         res = ParseDate.parsedate(gdatetime.to_s)
         Time.local(*res)
       end
\ No newline at end of file