Changeset 24524

Timestamp:

11/21/08 01:06:08 (4 years ago)

Author:

daisuke

Message:

make sure to cache timezones

Files:

• lang/perl/DateTime-Lite/trunk/lib/DateTime/Lite/TimeZone.pm (modified) (5 diffs)

lang/perl/DateTime-Lite/trunk/lib/DateTime/Lite/TimeZone.pm

@@ -15 +15 @@
 use DateTime::Lite::TimeZone::UTC;
 use DateTime::Lite::OlsonDB;
+
+our %CachedTimeZones;
 
 use constant INFINITY     =>       100 ** 1000 ;
@@ -35 +37 @@
     my $name = $p{name};
     my $conf;
+    my $zone;
     if (defined $name) {
         if ( exists $DateTime::Lite::TimeZone::Catalog::LINKS{ $name } ) {
@@ -41 +44 @@
             $name = $DateTime::Lite::TimeZone::Catalog::LINKS{ uc $name };
         }
-
+    }
+
+    if (defined $name) {
+        return $CachedTimeZones{$name} if $CachedTimeZones{$name};
         unless ( $name =~ m,/, || $SpecialName{ $name }) {
             if ( $name eq 'floating' ) {
-                return DateTime::Lite::TimeZone::Floating->new;
+                return $CachedTimeZones{$name} = DateTime::Lite::TimeZone::Floating->new;
             }
             if ( $name eq 'local' ) {
-                return DateTime::Lite::TimeZone::Local->TimeZone();
+                return $CachedTimeZones{$name} = DateTime::Lite::TimeZone::Local->TimeZone();
             }
     
             if ( $name eq 'UTC' || $name eq 'Z' ) {
-                return DateTime::Lite::TimeZone::UTC->new;
+                return $CachedTimeZones{$name} = DateTime::Lite::TimeZone::UTC->new;
             }
 
-            return DateTime::Lite::TimeZone::OffsetOnly->new( offset => $name );
+            return $CachedTimeZones{$name} = DateTime::Lite::TimeZone::OffsetOnly->new( offset => $name );
         }
+
         $conf = _load_time_zone($name);
     }
@@ -63 +70 @@
     }
 
-    my $zone = $class->new(%$conf);
+    $zone = $class->new(%$conf);
 
     if ( $zone->is_olson() ) {
@@ -78 +85 @@
     }
 
+    $CachedTimeZones{$name} = $zone;
     return $zone;
 }