jnode-svn-commits

[Jnode-svn-commits] SF.net SVN: jnode: [3376] trunk/core/src/driver/org/jnode/driver/console/ spi/AbstractConsoleManager.java

[<ls...@us...>]

Revision: 3376
          http://jnode.svn.sourceforge.net/jnode/?rev=3376&view=rev
Author:   lsantha
Date:     2007-08-02 13:12:03 -0700 (Thu, 02 Aug 2007)

Log Message:
-----------
Patch for exception when exitting the shell after startup by Stephen Crawley.

Modified Paths:
--------------
    trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java

Modified: trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java	2007-08-02 19:30:46 UTC (rev 3375)
+++ trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java	2007-08-02 20:12:03 UTC (rev 3376)
@@ -262,7 +262,7 @@
         }
 
         consoles.remove(console.getConsoleName());
-        if(currentStack != null && currentStack.peek() == console) {
+        if(currentStack != null && !currentStack.empty() && currentStack.peek() == console) {
             currentStack.pop();
             if(!currentStack.empty()) {
                 current = currentStack.peek();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jnode-svn-commits] SF.net SVN: jnode: [3963] trunk/core/src/driver/org/jnode/driver/console/ spi/AbstractConsoleManager.java

[<fd...@us...>]

Revision: 3963
          http://jnode.svn.sourceforge.net/jnode/?rev=3963&view=rev
Author:   fduminy
Date:     2008-04-17 15:00:46 -0700 (Thu, 17 Apr 2008)

Log Message:
-----------
specified type for contextConsole

Modified Paths:
--------------
    trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java

Modified: trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java	2008-04-17 14:33:02 UTC (rev 3962)
+++ trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java	2008-04-17 22:00:46 UTC (rev 3963)
@@ -68,7 +68,7 @@
     private final DeviceManager devMan;
     
     /** The holder for the context console */
-    private static final InheritableThreadLocal contextConsole = new InheritableThreadLocal();
+    private static final InheritableThreadLocal<Console> contextConsole = new InheritableThreadLocal<Console>();
 
     private AbstractConsoleManager parent;
 
@@ -162,7 +162,7 @@
      * @return Console
      */
     public Console getContextConsole() {
-        Console c = (Console)contextConsole.get();
+        Console c = contextConsole.get();
         if (c == null) {
             c = getFocus();
             contextConsole.set(c);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.