From ca9e049bc145ae985bc0e2dd6079dacdd51717ac Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Fri, 18 Nov 2005 00:59:33 +0000
Subject: Imported GNU Classpath gcj-import-20051117.

       * gnu/java/net/protocol/file/Connection.java: Removed, fully merged.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r107153
---
 libjava/classpath/java/io/FilePermission.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libjava/classpath/java/io')

diff --git a/libjava/classpath/java/io/FilePermission.java b/libjava/classpath/java/io/FilePermission.java
index 356787b..31802c6 100644
--- a/libjava/classpath/java/io/FilePermission.java
+++ b/libjava/classpath/java/io/FilePermission.java
@@ -278,13 +278,13 @@ public final class FilePermission extends Permission implements Serializable
 	break;
       }
 
-    if (readPerm && ! fp.readPerm)
+    if (fp.readPerm && ! readPerm)
       return false;
-    if (writePerm && ! fp.writePerm)
+    if (fp.writePerm && ! writePerm)
       return false;
-    if (executePerm && ! fp.executePerm)
+    if (fp.executePerm && ! executePerm)
       return false;
-    if (deletePerm && ! fp.deletePerm)
+    if (fp.deletePerm && ! deletePerm)
       return false;
     
     return true;
-- 
cgit v1.1