Logging, bug fixes.
authorTomas Zezula <tzezula@netbeans.org>
Wed, 05 Feb 2014 16:17:13 +0100
changeset 1815937728d953853
parent 18158 64706de02436
child 18160 3c8086f816d3
Logging, bug fixes.
dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ActiveSessions.java
dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ApplyCodeChangesHandler.java
     1.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ActiveSessions.java	Wed Feb 05 14:17:59 2014 +0100
     1.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ActiveSessions.java	Wed Feb 05 16:17:13 2014 +0100
     1.3 @@ -127,14 +127,20 @@
     1.4                      Thread.sleep(500);
     1.5                  }
     1.6              } catch (DebuggerStartException | InterruptedException ex) {
     1.7 +                LOG.log(Level.WARNING, "Debugger start Exception: {0}", ex);
     1.8                  return -1;
     1.9              }
    1.10 -            return jpda.getState() == JPDADebugger.STATE_RUNNING ||
    1.11 -                   jpda.getState() == JPDADebugger.STATE_STOPPED ?
    1.12 -                id :
    1.13 -                -1;
    1.14 -        }            
    1.15 -        return -1;
    1.16 +            final int state = jpda.getState();
    1.17 +            if (state == JPDADebugger.STATE_RUNNING || state == JPDADebugger.STATE_STOPPED) {
    1.18 +                return id;
    1.19 +            } else {
    1.20 +                LOG.log(Level.WARNING, "Wrong debugger state: {0}", state);
    1.21 +                return -1;
    1.22 +            }
    1.23 +        } else {
    1.24 +            LOG.warning("No debugger session");
    1.25 +            return -1;
    1.26 +        }
    1.27      }
    1.28  
    1.29      @CheckForNull
     2.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ApplyCodeChangesHandler.java	Wed Feb 05 14:17:59 2014 +0100
     2.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ApplyCodeChangesHandler.java	Wed Feb 05 16:17:13 2014 +0100
     2.3 @@ -115,8 +115,8 @@
     2.4                                  ap.invokeAction(null, lkp);
     2.5                              }
     2.6                          });
     2.7 -                    }
     2.8 -                    result = Status.accepted;
     2.9 +                        result = Status.accepted;
    2.10 +                    }                    
    2.11                  }
    2.12              }
    2.13          }