Changeset 1614

Timestamp:

09/12/05 21:31:15 (3 years ago)

Author:

nahi

Message:

avoid NameError? when http-access2 not installed. closes #145.

Files:

• trunk/lib/soap/streamHandler.rb (modified) (4 diffs)

trunk/lib/soap/streamHandler.rb

@@ -21 +21 @@
-
-class StreamHandler
-  Client = begin
-      require 'http-access2'
-      if HTTPAccess2::VERSION < "2.0"
-        raise LoadError.new("http-access/2.0 or later is required.")
-      end
-      HTTPAccess2::Client
-    rescue LoadError
-      warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
-      require 'soap/netHttpClient'
-      SOAP::NetHttpClient
-    end
-
-  RUBY_VERSION_STRING = "ruby #{ RUBY_VERSION } (#{ RUBY_RELEASE_DATE }) [#{ RUBY_PLATFORM }]"
-
-  RETRYABLE = (Client == HTTPAccess2::Client)
-
-  class ConnectionData
@@ -73 +59 @@
-  include SOAP
-
+  begin
+    require 'http-access2'
+    if HTTPAccess2::VERSION < "2.0"
+      raise LoadError.new("http-access/2.0 or later is required.")
+    end
+    Client = HTTPAccess2::Client
+    RETRYABLE = true
+  rescue LoadError
+    warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
+    require 'soap/netHttpClient'
+    Client = SOAP::NetHttpClient
+    RETRYABLE = false
+  end
+
+
-public
-  
@@ -78 +79 @@
-  attr_accessor :wiredump_file_base
-  
-NofRetry
+MAX_RETRY_COUNT
-
-  def initialize(options)
@@ -170 +171 @@
-        if RETRYABLE and HTTP::Status.redirect?(res.status)
-          retry_count += 1
-10
+MAX_RETRY_COUNT
-            raise HTTPStreamError.new("redirect count exceeded")
-          end