get the $CLASSPATH variable right and allow proper URL as well

adjusted some specs to check for path expanded entries. #2216
jruby · Dec 3, 2014 · 83044c2 · 83044c2
1 parent 76a514e
commit 83044c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/RubyClassPathVariable.java b/core/src/main/java/org/jruby/RubyClassPathVariable.java
@@ -68,10 +68,13 @@ public IRubyObject append(ThreadContext context, IRubyObject obj) {
 
         boolean is1_8 = context.getRuntime().is1_8();
         for (IRubyObject path: paths) {
-            path = is1_8 ? RubyFile.expand_path(context, null, new IRubyObject[]{ path })
-                         : RubyFile.expand_path19(context, null, new IRubyObject[]{ path });
             try {
                 URL url = getURL(path.convertToString().toString());
+                if (url.getProtocol().equals("file")) {
+                    path = is1_8 ? RubyFile.expand_path(context, null, new IRubyObject[]{ path })
+                            : RubyFile.expand_path19(context, null, new IRubyObject[]{ path });
+                    url = getURL(path.convertToString().toString());
+                }
                 getRuntime().getJRubyClassLoader().addURL(url);
             } catch (MalformedURLException mue) {
                 throw getRuntime().newArgumentError(mue.getLocalizedMessage());

diff --git a/spec/java_integration/globals/classpath_spec.rb b/spec/java_integration/globals/classpath_spec.rb
@@ -4,15 +4,14 @@
   describe "<<" do
     it "accepts an object" do
       $CLASSPATH << "file"
-      $CLASSPATH.to_a.include?("file:file").should == true
+      $CLASSPATH.to_a.include?("file:#{File.expand_path('file')}").should == true
     end
 
     it "accepts an array" do
       Dir.chdir(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')) do
         $CLASSPATH << Dir.glob("*.jar")
-        ($CLASSPATH.to_a.include?("file:jruby.jar") ||
-         $CLASSPATH.to_a.include?("file:jruby-complete.jar") ).should == true
+        ($CLASSPATH.to_a.include?("file:#{File.expand_path('jruby.jar')}")).should == true
       end
     end
   end
-end
+end