From 5c7411981584e487ac41794feb98a66df9fd6fcb Mon Sep 17 00:00:00 2001
From: gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 23 Mar 2012 15:19:26 +0000
Subject: Merge GNU Classpath 0.99 into libjava.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/vm/reference/gnu/java/nio/VMPipe.java     | 4 +++-
 libjava/classpath/vm/reference/gnu/java/nio/VMSelector.java | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'libjava/classpath/vm/reference/gnu/java/nio')

diff --git a/libjava/classpath/vm/reference/gnu/java/nio/VMPipe.java b/libjava/classpath/vm/reference/gnu/java/nio/VMPipe.java
index a369704522a..9a075342572 100644
--- a/libjava/classpath/vm/reference/gnu/java/nio/VMPipe.java
+++ b/libjava/classpath/vm/reference/gnu/java/nio/VMPipe.java
@@ -1,5 +1,5 @@
 /* VMPipe.java -- Reference implementation for VM hooks used by PipeImpl
-   Copyright (C) 2004 Free Software Foundation
+   Copyright (C) 2004, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -58,6 +58,8 @@ final class VMPipe
       }
   }
 
+  private VMPipe() {} // Prohibits instantiation.
+
   /**
    * Create a pipe, consisting of a readable VMChannel and a writable
    * VMChannel. The readable channel is returned is the first element
diff --git a/libjava/classpath/vm/reference/gnu/java/nio/VMSelector.java b/libjava/classpath/vm/reference/gnu/java/nio/VMSelector.java
index 4d37c2c1ca9..18fad5c8a62 100644
--- a/libjava/classpath/vm/reference/gnu/java/nio/VMSelector.java
+++ b/libjava/classpath/vm/reference/gnu/java/nio/VMSelector.java
@@ -1,5 +1,5 @@
 /* VMSelector.java --
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,8 +40,9 @@ package gnu.java.nio;
 import gnu.classpath.Configuration;
 import java.io.IOException;
 
-public final class VMSelector
+final class VMSelector
 {
+
   static
   {
     // load the shared library needed for native methods.
@@ -51,6 +52,8 @@ public final class VMSelector
       }
   }
 
+  private VMSelector() {} // Prohibits instantiation.
+
   // A timeout value of 0 means block forever.
   static native int select (int[] read, int[] write,
                                         int[] except, long timeout)
-- 
cgit v1.2.3