summaryrefslogtreecommitdiff
path: root/libjava/java/io/FileInputStream.java
diff options
context:
space:
mode:
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2003-05-06 10:07:28 +0000
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2003-05-06 10:07:28 +0000
commit9d18d1640d2587b8b184ea41d9b8905ce65b59dd (patch)
tree451228bc753694ff53382b99623580cc39ef00df /libjava/java/io/FileInputStream.java
parent6f823f9030e4059c4b0659eb5145ac62a604ceff (diff)
downloadgcc-9d18d1640d2587b8b184ea41d9b8905ce65b59dd.tar.gz
2003-05-06 Michael Koch <konqueror@gmx.de>
* java/io/DataOutputStream.java (write): Renamed argument to "value", merged documentation from classpath. (writeBoolean): Likewise. (writeByte): Likewise. (writeShort): Likewise. (writeChar): Likewise. (writeInt): Likewise. (writeLong): Likewise. (writeFloat): Likewise. (writeDouble): Likewise. (writeBytes): Likewise. (writeChars): Likewise. (writeUTF): Likewise. * java/io/File.java (performDelete): Added documentation. (performList): Likewise. (performMkdir): Likewise. (performSetReadOnly): Likewise. (performRenameTo): Likewise. (performSetLastModified): Likewise. (delete): Made it sychronized. (renameTo): Made it sychronized. (equals): Reformatted. (isHidden): Likewise. (listFiles): Likewise. (setReadOnly): Likewise. (listRoots): Likewise. (setLastModified): Likewise. (checkRead): Likewise. (checkWrite): Likewise. * java/io/FileInputStream.java (skip): Made it sychronized, merged from classpath. * java/io/FileOutputStream.java (write): Merged from classpath. * java/io/InputStreamReader.java: (InputStreamReader): Merged documentation from classpath. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66520 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/io/FileInputStream.java')
-rw-r--r--libjava/java/io/FileInputStream.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java
index b49922ed17a..e22a23a4326 100644
--- a/libjava/java/io/FileInputStream.java
+++ b/libjava/java/io/FileInputStream.java
@@ -82,6 +82,7 @@ public class FileInputStream extends InputStream
SecurityManager s = System.getSecurityManager();
if (s != null)
s.checkRead(name);
+
fd = new FileDescriptor(name, FileDescriptor.READ);
}
@@ -268,15 +269,15 @@ public class FileInputStream extends InputStream
*
* @exception IOException If an error occurs
*/
- public long skip (long numBytes) throws IOException
+ public synchronized long skip (long numBytes) throws IOException
{
if (numBytes < 0)
- throw new IllegalArgumentException ( "Can't skip negative bytes: " +
- numBytes);
+ throw new IllegalArgumentException ("Can't skip negative bytes: " +
+ numBytes);
if (numBytes == 0)
return 0;
-
+
long curPos = fd.getFilePointer ();
long newPos = fd.seek (numBytes, FileDescriptor.CUR, true);
return newPos - curPos;