Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aee83af731be
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e73d733794a
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 11, 2014

  1. delegate more methods JarFileState to underlying FileResource

    @mkristian
    mkristian committed Sep 11, 2014
    Copy the full SHA
    ceb6b26 View commit details

  2. get URLResource more compliant

    @mkristian
    mkristian committed Sep 11, 2014
    Copy the full SHA
    adca7cb View commit details

  3. Merge branch 'jruby-1_7' of jruby.org:jruby into jruby-1_7

    @mkristian
    mkristian committed Sep 11, 2014
    Copy the full SHA
    6e73d73 View commit details
Showing with 6 additions and 3 deletions.
  1. +3 −3 core/src/main/java/org/jruby/util/JarFileStat.java
  2. +3 −0 core/src/main/java/org/jruby/util/URLResource.java
6 changes: 3 additions & 3 deletions core/src/main/java/org/jruby/util/JarFileStat.java
View file
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ public boolean isFifo() {

@Override
public boolean isFile() {
return !resource.isDirectory();
return resource.isFile();
}

@Override
@@ -122,12 +122,12 @@ public boolean isROwned() {

@Override
public boolean isReadable() {
return true;
return resource.canRead();
}

@Override
public boolean isReadableReal() {
return true;
return resource.canRead();
}

@Override
3 changes: 3 additions & 0 deletions core/src/main/java/org/jruby/util/URLResource.java
View file
Original file line number Diff line number Diff line change
@@ -149,6 +149,9 @@ public InputStream openInputStream()

@Override
public ChannelDescriptor openDescriptor(ModeFlags flags, int perm) throws ResourceException {
if (!exists()) {
throw new ResourceException.NotFound(absolutePath());
}
return new ChannelDescriptor(openInputStream(), flags);
}