Changeset 9695

Timestamp:

04/18/08 19:01:41 (6 months ago)

Author:

daisuke

Message:

lang/perl/WebService-Simple; Only require if not loaded

Location:

lang/perl/WebService-Simple/branch/lwp-base

Files:

• Makefile.PL (modified) (1 diff)
• lib/WebService/Simple.pm (modified) (3 diffs)

lang/perl/WebService-Simple/branch/lwp-base/Makefile.PL

@@ -6 +6 @@
 
 requires( 'Class::Data::ConfigHash' );
+requires( 'Class::Inspector' );
 requires( 'Data::Dumper' );
 requires( 'Digest::MD5' );

lang/perl/WebService-Simple/branch/lwp-base/lib/WebService/Simple.pm

@@ -5 +5 @@
 use warnings;
 use base qw(LWP::UserAgent Class::Data::ConfigHash);
+use Class::Inspector;
 use Data::Dumper ();
 use Digest::MD5 ();
@@ -42 +43 @@
             $module = __PACKAGE__ . "::Parser::$module";
         }
-        $module->require or die;
+        if (! Class::Inspector->loaded($module)) {
+            $module->require or die;
+        }
         $response_parser = $module->new( %{ $config->{args} || {} } );
     };
@@ -55 +58 @@
 
             my $module = $config->{module};
-            $module->require or die;
+            if (! Class::Inspector->loaded($module)) {
+                $module->require or die;
+            }
             $cache = $module->new( $config->{hashref_args} ? $config->{args} : %{ $config->{args} } );
         }