*** empty log message ***

classpath/gnu/java/nio/SelectorImpl.java

@@ -233,6 +233,7 @@ public final class SelectorImpl extends AbstractSelector
                         }
                     } while(read.get_Count() == 0 && write.get_Count() == 0 && !unhandledWakeup);
                     // TODO result should be set correctly
+                    read.Remove(notifySocket);
                     result = read.get_Count() + write.get_Count();
                 }
                 else
@@ -265,6 +266,7 @@ public final class SelectorImpl extends AbstractSelector
                         }
                     } while(timeout > 0 && read.get_Count() == 0 && write.get_Count() == 0 && !unhandledWakeup);
                     // TODO result should be set correctly
+                    read.Remove(notifySocket);
                     result = read.get_Count() + write.get_Count();
                 }
               }

ikvmstub/ikvmstub.cs

@@ -163,7 +163,7 @@ public class NetExp
 	private static bool IsGenericType(java.lang.Class c)
 	{
 		// HACK huge hack, we look for the backtick
-		return c.getName().IndexOf("_0060") > 0;
+		return c.getName().IndexOf("$$0060") > 0;
 	}
 
 	private static void ProcessClass(string assemblyName, java.lang.Class c, java.lang.Class outer)