summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Galloway <kgallowa@redhat.com>2006-06-15 17:58:30 +0000
committerKyle Galloway <kgallowa@redhat.com>2006-06-15 17:58:30 +0000
commitaa181320ebd8fed87e209cd7c54e63d58136ef23 (patch)
tree00b8f03357c211ba9e010979ff2430567286858e
parent9490ae0cc1d1afe2a39d0f35a5034e30ad1866e5 (diff)
downloadclasspath-aa181320ebd8fed87e209cd7c54e63d58136ef23.tar.gz
2006-06-15 Kyle Galloway <kgallowa@redhat.com>
* gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java (matches): Added explicit brackets to return statement.
-rw-r--r--ChangeLog6
-rw-r--r--gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 97f13a37e..9235169a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-15 Kyle Galloway <kgallowa@redhat.com>
+
+ * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
+ (matches): Added explicit brackets to return statement.
+
2006-06-15 Tania Bento <tbento@redhat.com>
* javax/swing/AbstractButton.java:
@@ -63,6 +68,7 @@
Added serialization UID and changed to extend
javax.management.JMException.
+>>>>>>> 1.7826
2006-06-14 Lillian Angel <langel@redhat.com>
* java/awt/Component.java
diff --git a/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java b/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
index 119aab2b5..8bb56ed78 100644
--- a/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
+++ b/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
@@ -117,7 +117,7 @@ public class ExceptionOnlyFilter
Boolean caught
= (Boolean) event.getParameter(Event.EVENT_EXCEPTION_CAUGHT);
- return classMatch && (caught.booleanValue()) ? _caught : _uncaught;
+ return classMatch && ((caught.booleanValue()) ? _caught : _uncaught);
}
}