[kaffe] CVS kaffe (kaz): kaffe/kaffevm/locks.c

[Kaffe CVS]

PatchSet 4652 
Date: 2004/04/16 15:28:17
Author: kaz
Branch: HEAD
Tag: (none) 
Log:
2004-04-16  Ito kazumitsu <kaz at maczuka.gcd.org>
        * kaffe/kaffevm/locks.c
        slowUnlockMutex(): lk->holder may be null. So check it before
        calling jthread_on_current_stack.I

2004-04-16  Helmer Kraemer <hkraemer at freenet.de>
        * libraries/javalib/java/net/Socket.java
        getImpl(): Avoid creating a redundant file descriptor.

Members: 
	ChangeLog:1.2228->1.2229 
	kaffe/kaffevm/locks.c:1.47->1.48 
	libraries/javalib/java/net/Socket.java:1.31->1.32 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2228 kaffe/ChangeLog:1.2229
--- kaffe/ChangeLog:1.2228	Fri Apr 16 15:02:36 2004
+++ kaffe/ChangeLog	Fri Apr 16 15:28:17 2004
@@ -1,3 +1,12 @@
+2004-04-16  Ito kazumitsu <kaz at maczuka.gcd.org>
+        * kaffe/kaffevm/locks.c
+	slowUnlockMutex(): lk->holder may be null. So check it before
+	calling jthread_on_current_stack.I
+
+2004-04-16  Helmer Kraemer <hkraemer at freenet.de>
+	* libraries/javalib/java/net/Socket.java
+	getImpl(): Avoid creating a redundant file descriptor.
+
 2004-04-16  Guilhem Lavaux <guilhem at kaffe.org>
 
 	* libraries/javalib/java/io/FileOutputStream.java
@@ -58,6 +67,7 @@
 	Fix bug where the exec code would search the path for
 	a binary, but then didn't use the found file.
 
+>>>>>>> 1.2228
 2004-04-15  Jim Pick <jim at kaffe.org>
 
 	* configure.ac:
Index: kaffe/kaffe/kaffevm/locks.c
diff -u kaffe/kaffe/kaffevm/locks.c:1.47 kaffe/kaffe/kaffevm/locks.c:1.48
--- kaffe/kaffe/kaffevm/locks.c:1.47	Sun Feb  1 22:14:53 2004
+++ kaffe/kaffe/kaffevm/locks.c	Fri Apr 16 15:28:23 2004
@@ -220,7 +220,7 @@
 	lk = getHeavyLock(lkp, heavyLock);
 
 	/* Only the lock holder can be doing an unlock */
-	if (!jthread_on_current_stack(lk->holder)) {
+	if ((lk->holder != NULL) && (!jthread_on_current_stack(lk->holder))) {
 		putHeavyLock(lkp, lk);
 		jthread_enable_stop();
 		throwException(IllegalMonitorStateException);
Index: kaffe/libraries/javalib/java/net/Socket.java
diff -u kaffe/libraries/javalib/java/net/Socket.java:1.31 kaffe/libraries/javalib/java/net/Socket.java:1.32
--- kaffe/libraries/javalib/java/net/Socket.java:1.31	Mon Mar 22 11:24:50 2004
+++ kaffe/libraries/javalib/java/net/Socket.java	Fri Apr 16 15:28:24 2004
@@ -82,11 +82,6 @@
   private SocketImpl impl;
 
   /**
-   * True if socket implementation was created by calling their create() method.
-   */
-  private boolean implCreated;
-
-  /**
    * True if the socket is bound.
    */
   private boolean bound;
@@ -312,19 +307,6 @@
   SocketImpl getImpl()
     throws SocketException
   {
-    try
-      {
-	if (!implCreated)
-	  {
-	    impl.create(true);
-	    implCreated = true;
-	  }
-      }
-    catch (IOException e)
-      {
-	throw new SocketException(e.getMessage());
-      }
-
     return impl;
   }
 
@@ -358,6 +340,7 @@
     // bind to address/port
     try
       {
+        getImpl().create (true);
         getImpl().bind (tmp.getAddress(), tmp.getPort());
 	bound = true;
       }