This document lists the standard bug patterns reported by\n\
- FindBugs version @VERSION@.
+
This document lists the standard bug patterns reported by\n\
+ FindBugs version @VERSION@.
doc.html.gen.allBugDescriptions.prologue=\
-
This document lists all of the bug patterns reported by the\n\
- latest development version of \n\
- FindBugs. Note that this may include\n\
- bug patterns not available in any released version of FindBugs,\n\
- as well as bug patterns that are not enabled by default.
+
This document lists all of the bug patterns reported by the\n\
+ latest development version of \n\
+ FindBugs. Note that this may include\n\
+ bug patterns not available in any released version of FindBugs,\n\
+ as well as bug patterns that are not enabled by default.
diff --git a/etc/findbugs.xml b/etc/findbugs.xml
index 2b49e10..e718d6b 100644
--- a/etc/findbugs.xml
+++ b/etc/findbugs.xml
@@ -417,7 +417,6 @@
reports="CAA_COVARIANT_ARRAY_FIELD,CAA_COVARIANT_ARRAY_RETURN,CAA_COVARIANT_ARRAY_LOCAL,CAA_COVARIANT_ARRAY_ELEMENT_STORE"/>
- "/>
This detector looks for synchronization on a shared builtin constant (such as a String).
+
This detector looks for synchronization on a shared built-in constant (such as a String).
]]>
@@ -605,7 +605,7 @@
This detector generates a random signal: warnings that are just based on
hash values of the operations performed by methods.
These warnings are bogus random noise, intended to be useful
- as a control in data mining experiments, not in finding actual bugs in software
+ as a control in data mining experiments, not in finding actual bugs in software.
This detector is just a hook for testing new detectors.
Normally, this detector does nothing.
@@ -869,7 +869,7 @@
This iterator looks for problems in how Iterator classes are defined.
+
This detector looks for problems in how Iterator classes are defined.
]]>
@@ -1206,7 +1206,7 @@
-This detector looks for calls to Thread.interrupted() from a non static context. If it is called from
+This detector looks for calls to Thread.interrupted() from a non-static context. If it is called from
Thread.currentThread().interrupted(), then it is just a useless exercise, just use Thread.interrupted().
However if it is called on an arbitrary thread object, it is most probably an error, as interrupted()
is always called on the current thread.
@@ -1294,7 +1294,7 @@
This detector looks circular dependencies among classes.
+
This detector looks for circular dependencies among classes.
]]>
@@ -1320,7 +1320,7 @@
This detector looks for public classes that synchronize and use wait(), notify() or notifyAll()
on this. This exposes a synchronization implementation as a public artifact of the class.
-Clients of the class may use an instance of the class as it's own synchronizing object, and cause
+Clients of the class may use an instance of the class as its own synchronizing object, and cause
havoc to the base implementation.
]]>
@@ -1368,7 +1368,7 @@
-This detector looks for uses of of non Serializable objects in contexts that require them to be serializable.
+This detector looks for uses of non Serializable objects in contexts that require them to be serializable.
]]>
@@ -1398,7 +1398,7 @@
This detector problems looks for miscellaneous small errors
+
This detector looks for miscellaneous small errors
mentioned by Joshua Bloch and Neal Gafter in
their work on Programming Puzzlers.
@@ -1462,7 +1462,7 @@
- This detector for final classes that declare protected members. As this
+ This detector looks for final classes that declare protected members. As this
class can not be derived from, the use of protected access for members is
incorrect. The access should be changed to public or private to represent
the correct intention of the field. This was probably caused by a change in
@@ -1607,7 +1607,7 @@
Looks for an attempt to append to an object output stream
+
Looks for an attempt to append to an object output stream.
]]>
@@ -1758,7 +1758,7 @@
Creation of ScheduledThreadPoolExecutor with zero core threads in {1}
(Javadoc)
+
(Javadoc)
A ScheduledThreadPoolExecutor with zero core threads will never execute anything; changes to the max pool size are ignored.
@@ -1770,7 +1770,7 @@
Futile attempt to change max pool size of ScheduledThreadPoolExecutor in {1}
(Javadoc)
+
(Javadoc)
While ScheduledThreadPoolExecutor inherits from ThreadPoolExecutor, a few of the inherited tuning methods are not useful for it. In particular, because it acts as a fixed-sized pool using corePoolSize threads and an unbounded queue, adjustments to maximumPoolSize have no useful effect.
@@ -2045,9 +2045,9 @@
- The usage of Optional return type (java.util.Optional or com.google.common.base.Optiona)
- always mean that explicit null returns were not desired by design.
- Returning a null value in such case is a contract violation and will most likely break clients code.
+ The usage of Optional return type (java.util.Optional or com.google.common.base.Optional)
+ always means that explicit null returns were not desired by design.
+ Returning a null value in such case is a contract violation and will most likely break client code.
]]>
@@ -2134,7 +2134,7 @@
Unknown bug pattern BUG_PATTERN in {1}
A warning was recorded, but findbugs can't find the description of this bug pattern
+
A warning was recorded, but FindBugs can't find the description of this bug pattern
and so can't describe it. This should occur only in cases of a bug in FindBugs or its configuration,
or perhaps if an analysis was generated using a plugin, but that plugin is not currently loaded.
.
@@ -2685,7 +2685,7 @@
A random value from 0 to 1 is being coerced to the integer value 0. You probably
-want to multiple the random value by something else before coercing it to an integer, or use the Random.nextInt(n) method.
+want to multiply the random value by something else before coercing it to an integer, or use the Random.nextInt(n) method.
]]>
@@ -2889,7 +2889,7 @@
This is considered bad practice, as it makes it very hard to implement an equals method that
-is symmetric and transitive. Without those properties, very unexpected behavoirs are possible.
+is symmetric and transitive. Without those properties, very unexpected behaviors are possible.
]]>
@@ -3064,7 +3064,7 @@
A large String constant is duplicated across multiple class files.
This is likely because a final field is initialized to a String constant, and the Java language
mandates that all references to a final field from other classes be inlined into
-that classfile. See JDK bug 6447475
+that classfile. See JDK bug 6447475
for a description of an occurrence of this bug in the JDK and how resolving it reduced
the size of the JDK by 1 megabyte.
@@ -3349,7 +3349,7 @@
{1} is a mutable servlet field
A web server generally only creates one instance of servlet or jsp class (i.e., treats
+
A web server generally only creates one instance of servlet or JSP class (i.e., treats
the class as a Singleton),
and will
have multiple threads invoke methods on that instance to service multiple
@@ -3509,8 +3509,8 @@
when evaluating the right-hand side can generate an error.
]]>
@@ -3599,7 +3599,7 @@
{2.name} isn't initialized in {1} when invoked from constructor for superclass
This method is invoked in the constructor of of the superclass. At this point,
+
This method is invoked in the constructor of the superclass. At this point,
the fields of the class have not yet initialized.
To make this more concrete, consider the following classes:
abstract class A {
@@ -3622,7 +3622,7 @@
the constructor for the A class is invoked
before the constructor for B sets value.
Thus, when the constructor for A invokes getValue,
-an uninitialized value is read for value
+an uninitialized value is read for value.
]]>
Since there normally exist only two Boolean objects, this code could be synchronizing on the same object as other, unrelated code, leading to unresponsiveness
-and possible deadlock
Since Integer objects can be cached and shared,
this code could be synchronizing on the same object as other, unrelated code, leading to unresponsiveness
-and possible deadlock
]]>
@@ -4027,7 +4027,7 @@
An inner class is invoking a method that could be resolved to either a inherited method or a method defined in an outer class.
For example, you invoke foo(17), which is defined in both a superclass and in an outer method.
By the Java semantics,
-it will be resolved to invoke the inherited method, but this may not be want
+it will be resolved to invoke the inherited method, but this may not be what
you intend.
If you really intend to invoke the inherited method,
@@ -4895,8 +4895,8 @@
Useless condition: it's known that {2} at this point
This condition always produces the same result as the value of the involved variable was narrowed before.
-Probably something else was meant or condition can be removed.
+
This condition always produces the same result as the value of the involved variable that was narrowed before.
+Probably something else was meant or the condition can be removed.
]]>
@@ -4906,7 +4906,7 @@
This condition always produces the same result due to the type range of the involved variable.
-Probably something else was meant or condition can be removed.
+Probably something else was meant or the condition can be removed.
]]>
@@ -5609,7 +5609,7 @@
but it is possible to create other Boolean objects using the new Boolean(b)
constructor. It is best to avoid such objects, but if they do exist,
then checking Boolean objects for equality using == or != will give results
-than are different than you would get using .equals(...)
+than are different than you would get using .equals(...).
]]>
@@ -5859,7 +5859,7 @@
The Double.longBitsToDouble method is invoked, but a 32 bit int value is passed
- as an argument. This almostly certainly is not intended and is unlikely
+ as an argument. This almost certainly is not intended and is unlikely
to give the intended result.
]]>
@@ -5903,7 +5903,7 @@
This code generates a random signed integer and then computes
the absolute value of that random integer. If the number returned by the random number
generator is Integer.MIN_VALUE, then the result will be negative as well (since
-Math.abs(Integer.MIN_VALUE) == Integer.MIN_VALUE). (Same problem arised for long values as well).
+Math.abs(Integer.MIN_VALUE) == Integer.MIN_VALUE). (Same problem arises for long values as well).
]]>
@@ -5951,11 +5951,11 @@
you may need to change your code.
If you know the divisor is a power of 2,
you can use a bitwise and operator instead (i.e., instead of
-using x.hashCode()%n, use x.hashCode()&(n-1).
+using x.hashCode()%n, use x.hashCode()&(n-1)).
This is probably faster than computing the remainder as well.
If you don't know that the divisor is a power of 2, take the absolute
value of the result of the remainder operation (i.e., use
-Math.abs(x.hashCode()%n)
+Math.abs(x.hashCode()%n)).
]]>
@@ -5979,7 +5979,7 @@
Signed bytes can only have a value in the range -128 to 127. Comparing
a signed byte with a value outside that range is vacuous and likely to be incorrect.
To convert a signed byte b to an unsigned value in the range 0..255,
-use 0xff & b
+use 0xff & b.
]]>
@@ -5991,7 +5991,7 @@
This code compares an int value with a long constant that is outside
the range of values that can be represented as an int value.
-This comparison is vacuous and possibily to be incorrect.
+This comparison is vacuous and possibly to be incorrect.
]]>
@@ -6040,7 +6040,7 @@
Loads a byte value (e.g., a value loaded from a byte array or returned by a method
with return type byte) and performs a bitwise OR with
that value. Byte values are sign extended to 32 bits
-before any any bitwise operations are performed on the value.
+before any bitwise operations are performed on the value.
Thus, if b[0] contains the value 0xff, and
x is initially 0, then the code
((x << 8) | b[0]) will sign extend 0xff
@@ -6072,7 +6072,7 @@
Adds a byte value and a value which is known to have the 8 lower bits clear.
Values loaded from a byte array are sign extended to 32 bits
-before any any bitwise operations are performed on the value.
+before any bitwise operations are performed on the value.
Thus, if b[0] contains the value 0xff, and
x is initially 0, then the code
((x << 8) + b[0]) will sign extend 0xff
@@ -6114,35 +6114,27 @@
Check for sign of bitwise operation in {1}
This method compares an expression such as
-
((event.detail & SWT.SELECTED) > 0)
.
-
Using bit arithmetic and then comparing with the greater than operator can
+
This method compares an expression such as
+((event.detail & SWT.SELECTED) > 0).
+Using bit arithmetic and then comparing with the greater than operator can
lead to unexpected results (of course depending on the value of
SWT.SELECTED). If SWT.SELECTED is a negative number, this is a candidate
for a bug. Even when SWT.SELECTED is not negative, it seems good practice
to use '!= 0' instead of '> 0'.
-
-Boris Bokowski
-
]]>
- Check for sign of bitwise operation
- Check for sign of bitwise operation in {1}
-
- This method compares an expression such as
-
((event.detail & SWT.SELECTED) > 0)
.
-
Using bit arithmetic and then comparing with the greater than operator can
-lead to unexpected results (of course depending on the value of
-SWT.SELECTED). If SWT.SELECTED is a negative number, this is a candidate
-for a bug. Even when SWT.SELECTED is not negative, it seems good practice
+ Check for sign of bitwise operation involving negative number
+ Check for sign of bitwise operation involving {2} in {1}
+
+ This method compares a bitwise expression such as
+((val & CONSTANT) > 0) where CONSTANT is the negative number.
+Using bit arithmetic and then comparing with the greater than operator can
+lead to unexpected results. This comparison is unlikely to work as expected. The good practice is
to use '!= 0' instead of '> 0'.
-
-
-Boris Bokowski
]]>
@@ -6152,7 +6144,7 @@
Check to see if ((...) & 0) == 0 in {1}
This method compares an expression of the form (e & 0) to 0,
+
This method compares an expression of the form (e & 0) to 0,
which will always compare equal.
This may indicate a logic error or typo.
]]>
@@ -6163,7 +6155,7 @@
Incompatible bit masks in (e | {2} == {3}) yields constant result in {1}
This method compares an expression of the form (e | C) to D.
+
This method compares an expression of the form (e | C) to D.
which will always compare unequal
due to the specific values of constants C and D.
This may indicate a logic error or typo.
@@ -6171,6 +6163,9 @@
Typically, this bug occurs because the code wants to perform
a membership test in a bit set, but uses the bitwise OR
operator ("|") instead of bitwise AND ("&").
+
+
Also such bug may appear in expressions like (e & A | B) == C
+which is parsed like ((e & A) | B) == C while (e & (A | B)) == C was intended.
]]>
@@ -6215,7 +6210,7 @@
This method contains an unsynchronized lazy initialization of a static field.
After the field is set, the object stored into that location is further updated or accessed.
The setting of the field is visible to other threads as soon as it is set. If the
-futher accesses in the method that set the field serve to initialize the object, then
+further accesses in the method that set the field serve to initialize the object, then
you have a very serious multithreading bug, unless something else prevents
any other thread from accessing the stored object until it is fully initialized.
@@ -6509,7 +6504,7 @@
TestCase {0} has no tests
Class is a JUnit TestCase but has not implemented any test methods
+
Class is a JUnit TestCase but has not implemented any test methods.
See Sun's article on Java SE compatibility
for more details and examples, and suggestions on how to force class initialization in Java 5.
]]>
@@ -7194,8 +7189,8 @@
-This format string include a newline character (\n). In format strings, it is generally
- preferable better to use %n, which will produce the platform-specific line separator.
+This format string includes a newline character (\n). In format strings, it is generally
+ preferable to use %n, which will produce the platform-specific line separator.
]]>
@@ -7206,7 +7201,7 @@
-One of the arguments is uncompatible with the corresponding format string specifier.
+One of the arguments is incompatible with the corresponding format string specifier.
As a result, this will generate a runtime exception when executed.
For example, String.format("%d", "1") will generate an exception, since
the String "1" is incompatible with the format specifier %d.
@@ -7433,7 +7428,7 @@
The correct way to do get an array of a specific type from a collection is to use
c.toArray(new String[]);
or c.toArray(new String[c.size()]); (the latter is slightly more efficient).
-
There is one common/known exception exception to this. The toArray()
+
There is one common/known exception to this. The toArray()
method of lists returned by Arrays.asList(...) will return a covariantly
typed array. For example, Arrays.asArray(new String[] { "a" }).toArray()
will return a String []. FindBugs attempts to detect and suppress
@@ -7578,7 +7573,7 @@
The code here uses File.separator
where a regular expression is required. This will fail on Windows
platforms, where the File.separator is a backslash, which is interpreted in a
-regular expression as an escape character. Amoung other options, you can just use
+regular expression as an escape character. Among other options, you can just use
File.separatorChar=='\\' ? "\\\\" : File.separator instead of
File.separator
@@ -7662,7 +7657,7 @@
The code invokes hashCode on an array. Calling hashCode on
-an array returns the same value as System.identityHashCode, and ingores
+an array returns the same value as System.identityHashCode, and ignores
the contents and length of the array. If you need a hashCode that
depends on the contents of an array a,
use java.util.Arrays.hashCode(a).
@@ -7710,7 +7705,7 @@
use (low+high) >>> 1
This bug exists in many earlier implementations of binary search and merge sort.
-Martin Buchholz found and fixed it
+Martin Buchholz found and fixed it
in the JDK libraries, and Joshua Bloch
widely
publicized the bug pattern.
@@ -8037,14 +8032,14 @@
{1} is static field of type java.util.Calendar, which isn't thread safe
Even though the JavaDoc does not contain a hint about it, Calendars are inherently unsafe for multihtreaded use.
+
Even though the JavaDoc does not contain a hint about it, Calendars are inherently unsafe for multithreaded use.
Sharing a single instance across thread boundaries without proper synchronization will result in erratic behavior of the
application. Under 1.4 problems seem to surface less often than under Java 5 where you will probably see
random ArrayIndexOutOfBoundsExceptions or IndexOutOfBoundsExceptions in sun.util.calendar.BaseCalendar.getCalendarDateFromFixedDate().
]]>
@@ -8053,11 +8048,11 @@
Call to method of static java.util.Calendar in {1}
Even though the JavaDoc does not contain a hint about it, Calendars are inherently unsafe for multihtreaded use.
+
Even though the JavaDoc does not contain a hint about it, Calendars are inherently unsafe for multithreaded use.
The detector has found a call to an instance of Calendar that has been obtained via a static
-field. This looks suspicous.
]]>
@@ -8083,9 +8078,9 @@
As the JavaDoc states, DateFormats are inherently unsafe for multithreaded use.
The detector has found a call to an instance of DateFormat that has been obtained via a static
-field. This looks suspicous.
-
+ã“ã†ã—ãŸãƒã‚°ã¯ (e & (A | B)) == C ãŒæ„図ã•ã‚Œã¦ã„ã‚‹é–“ã« ((e & A) | B) == C ã®ã‚ˆã†ã«è§£æžã•ã‚Œã‚‹ (e & A | B) == C ã®ã‚ˆã†ãªå¼ã§ç¾ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。
excludePath (classpath or classpathRef to filters)
*
failOnError (boolean - default false)
*
home (findbugs install dir)
*
includeFilter (filter filename)
+ *
includePath (classpath or classpathRef to filters)
*
maxRank (maximum rank issue to be reported)
*
jvm (Set the command used to start the VM)
*
jvmargs (any additional jvm arguments)
- *
omitVisitors (collection - comma seperated)
+ *
omitVisitors (collection - comma separated)
*
onlyAnalyze (restrict analysis to find bugs to given comma-separated list
* of classes and packages - See the textui argument description for details)
*
setSetExitCode (boolean default true)
@@ -136,7 +138,11 @@
private File excludeFile;
+ private Path excludePath;
+
private File includeFile;
+
+ private Path includePath;
private Path auxClasspath;
@@ -532,6 +538,62 @@
*/
public void setSourcePathRef(Reference r) {
createSourcePath().setRefid(r);
+ }
+
+ /**
+ * the sourcepath to use.
+ */
+ public void setExcludePath(Path src) {
+ if (excludePath == null) {
+ excludePath = src;
+ } else {
+ excludePath.append(src);
+ }
+ }
+
+ /**
+ * Path to use for sourcepath.
+ */
+ public Path createExcludePath() {
+ if (excludePath == null) {
+ excludePath = new Path(getProject());
+ }
+ return excludePath.createPath();
+ }
+
+ /**
+ * Adds a reference to a source path defined elsewhere.
+ */
+ public void setExcludePathRef(Reference r) {
+ createExcludePath().setRefid(r);
+ }
+
+ /**
+ * the sourcepath to use.
+ */
+ public void setIncludePath(Path src) {
+ if (includePath == null) {
+ includePath = src;
+ } else {
+ includePath.append(src);
+ }
+ }
+
+ /**
+ * Path to use for sourcepath.
+ */
+ public Path createIncludePath() {
+ if (includePath == null) {
+ includePath = new Path(getProject());
+ }
+ return includePath.createPath();
+ }
+
+ /**
+ * Adds a reference to a source path defined elsewhere.
+ */
+ public void setIncludePathRef(Reference r) {
+ createIncludePath().setRefid(r);
}
/**
@@ -728,9 +790,23 @@
addArg("-exclude");
addArg(excludeFile.getPath());
}
+ if (excludePath != null) {
+ String[] result = excludePath.toString().split(java.io.File.pathSeparator);
+ for (int x = 0; x < result.length; x++) {
+ addArg("-exclude");
+ addArg(result[x]);
+ }
+ }
if (includeFile != null) {
addArg("-include");
addArg(includeFile.getPath());
+ }
+ if (includePath != null) {
+ String[] result = includePath.toString().split(java.io.File.pathSeparator);
+ for (int x = 0; x < result.length; x++) {
+ addArg("-include");
+ addArg(result[x]);
+ }
}
if (visitors != null) {
addArg("-visitors");
diff --git a/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsViewerTask.java b/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsViewerTask.java
index 9ba5aa4..baf6021 100644
--- a/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsViewerTask.java
+++ b/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsViewerTask.java
@@ -32,7 +32,7 @@
/**
* FindBugsViewerTask.java -- Ant Task to launch the FindBugsFrame
*
- * To use, create a new task that refrences the ant task (such as
+ * To use, create a new task that references the ant task (such as
* "findbugs-viewer"). Then call this task while passing in parameters to modify
* it's behaviour. It supports several options that are the same as the findbugs
* task:
diff --git a/src/doc/Changes.html b/src/doc/Changes.html
index 232aa38..988fbc0 100644
--- a/src/doc/Changes.html
+++ b/src/doc/Changes.html
@@ -706,7 +706,7 @@
Changes since version 1.3.5
Added fairly exhaustive static analysis of uses of format
- strings, checking for missing or extra arguements, invalid format
+ strings, checking for missing or extra arguments, invalid format
specifiers, or mismatched format specifiers and arguments (e.g,
passing a String value for a %d format specifier). The logic for
doing so is derived from Sun's java.util.Formatter class, and
@@ -1304,7 +1304,7 @@
extends beta.Foo). This can be exceptionally
confusing, create lots of situations in which you have to look
at import statements to resolve references and creates many
- opportunities to accidently define methods that do not
+ opportunities to accidentally define methods that do not
override methods in their superclasses.
NM_SAME_SIMPLE_NAME_AS_INTERFACE: This class/interface
@@ -1313,7 +1313,7 @@
in a different package (e.g., alpha.Foo extends beta.Foo).
This can be exceptionally confusing, create lots of situations
in which you have to look at import statements to resolve
- references and creates many opportunities to accidently define
+ references and creates many opportunities to accidentally define
methods that do not override methods in their superclasses.
@@ -2130,10 +2130,10 @@
Updated detectors
-
SwitchFallthrough.java: surpress some false positives
-
DuplicateBranches.java: surpress some false positives
-
IteratorIdioms.java: surpress some false positives
-
FindHEmismatch.java: surpress some false positives
+
SwitchFallthrough.java: suppress some false positives
+
DuplicateBranches.java: suppress some false positives
+
IteratorIdioms.java: suppress some false positives
+
FindHEmismatch.java: suppress some false positives
QuestionableBooleanAssignment.java: finds more cases of
if (b=true) ilk
@@ -2444,7 +2444,7 @@
New detector to find calls to equals() methods that use
Object's version. (Dave Brosius)
New detector to find Applets that call methods in the
- constructor refering to the AppletStub (Dave Brosius)
+ constructor referring to the AppletStub (Dave Brosius)
New detector to find some cases of infinite recursion
(Bill Pugh)
New detector to find dead stores to local variables (David
@@ -2498,7 +2498,7 @@
Allow Swing GUI to show source code in jar files on
Windows systems (Dave Brosius)
-
Fix the Switch Fall Thru detector (Dave Brosius, David
+
Fix the Switch Fall Through detector (Dave Brosius, David
Hovemeyer, Bill Pugh)
MacOS GUI fixes (Rohan Lloyd)
Fix false positive in BOA in case where method is
diff --git a/src/doc/contributing.html b/src/doc/contributing.html
index 0531869..503567d 100644
--- a/src/doc/contributing.html
+++ b/src/doc/contributing.html
@@ -21,18 +21,17 @@
The preferred way to get the FindBugs source code and create the patch is to use Eclipse + Git.
You can easily import FindBugs code into Eclipse by following the steps described
-here: Import Eclipse projects
+here: Import Eclipse projects
.
The best way to create a patch is to fork FindBugs Git repository here:
+ https://github.com/findbugsproject/findbugs,
commit changes with descriptive commit messages (small commits are better) and
- create a new bug
- or feature request
- with the "[patch]" prefix in the title and link to your repository in the description.
+ create a new pull request
+ with the appropriate title and description.
Please follow these guidelines when preparing your patch:
@@ -48,7 +47,7 @@
If you are submitting a new bug detector, please submit a small
standalone source file that contains an instance of the
kind of bug the detector looks for. The file should be placed at
- findbugsTestCases/src/java/sfBugsNew
+ findbugsTestCases/src/java/ghBugsNew
package and named after the bug or feature you are addressing.
@@ -58,9 +57,8 @@
Where to submit a patch
Patches may be submitted through the
-bug
- or feature request trackers on the
-sourceforge project page.
+pull requests on the
+GitHub project page.
@HTML_FOOTER@
diff --git a/src/doc/findbugs2.html b/src/doc/findbugs2.html
index b169227..cd86014 100644
--- a/src/doc/findbugs2.html
+++ b/src/doc/findbugs2.html
@@ -35,7 +35,7 @@
Please report bugs using the
-Sourceforge
-bugs tracker. Note that you need to be logged in to sourceforge to
+GitHub
+bugs tracker. Note that you need to be logged in to GitHub to
use the bug tracker.
-If you cannot use the Sourceforge tracker, you can try sending
+If you cannot use the GitHub tracker, you can try sending
email to the findbugs-discuss mailing list. You must be subscribed
to the list to post a message.
diff --git a/src/doc/sysprops.html b/src/doc/sysprops.html
index f68c330..2c71747 100644
--- a/src/doc/sysprops.html
+++ b/src/doc/sysprops.html
@@ -68,7 +68,7 @@
findbugs.sf.comment
-
Ignore switch fall thru bugs if a comment is found with 'fall' or 'nobreak'
+
Ignore switch fall through bugs if a comment is found with 'fall' or 'nobreak'
You can also redirect all update checks to a local server. This allows you to collect information about who is using
what versions of FindBugs in your organization, and keep all of that information private.
All of the plugins from the FindBugs project use
http://update.findbugs.org/update-check
as the
-host we use for update checks. If you wish to ensure that no one from your organization accidently reports any usage
+host we use for update checks. If you wish to ensure that no one from your organization accidentally reports any usage
information to the FindBugs project, you can blacklist that URL in your firewall
You can also block
http://findbugs-cloud.appspot.com
, the host we use for our publicly hosted
repository of bug evaluations (e.g., evaluations in open source projects such as the JDK, Eclipse and GlassFish).
While people have to explicitly request that their evaluations be stored into the FindBugs cloud, you
-can block it to ensure that no one accidently shares evaluations of your own code to the FindBugs cloud. You can also
+can block it to ensure that no one accidentally shares evaluations of your own code to the FindBugs cloud. You can also
remove the WebCloudClient
The following companies, projects and organizations have given us
permission to identify them as FindBugs users and/or have
- publically stated that they use FindBugs. Send email to
+ publicly stated that they use FindBugs. Send email to
findbugs@cs.umd.edu if
you'd like to be listed here.
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/BugSaver.java b/src/gui/edu/umd/cs/findbugs/gui2/BugSaver.java
index fe9763c..5b22849 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/BugSaver.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/BugSaver.java
@@ -54,7 +54,7 @@
saveBugs(UTF8.fileWriter(out), data, p);
lastPlaceSaved = out.getAbsolutePath();
} catch (IOException e) {
- JOptionPane.showMessageDialog(null, "An error has occured in saving your file");
+ JOptionPane.showMessageDialog(null, "An error has occurred in saving your file");
}
}
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/BugTreeModel.java b/src/gui/edu/umd/cs/findbugs/gui2/BugTreeModel.java
index cbe5b6c..d5677bb 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/BugTreeModel.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/BugTreeModel.java
@@ -45,7 +45,7 @@
* Our TreeModel. Once upon a time it was a simple model, that queried data, its BugSet, for what to show under each branch
* Then it got more and more complicated, no one knows why it still seems to work... or why it doesn't if it in fact doesn't.
*
- * Here's a tip, Dont even attempt to deal with suppressions or filtering and their related tree model events without the API
+ * Here's a tip, Don't even attempt to deal with suppressions or filtering and their related tree model events without the API
* for TreeModelEvents open. And read it three times first. Ignore the fact that its inconsistent for sending events about the root, just pick one of the things it says and go with it
*
* Heres the order things MUST be done when dealing with suppressions, filtering, unsuppressions... unfiltering... all that fun stuff
@@ -354,8 +354,8 @@
// If this thread is not interrupting a previous thread, set the paths
// to be opened when the new tree is complete
- // If the thread is interrupting another thread, dont do this, because
- // you dont have the tree with the correct paths selected
+ // If the thread is interrupting another thread, don't do this, because
+ // you don't have the tree with the correct paths selected
// As of now, it should be impossible to interrupt a rebuilding thread,
// in another version this may change, so this if statement check is
@@ -754,7 +754,7 @@
void sendEvent(TreeModelEvent event, TreeModification whatToDo) {
Debug.println("Sending An Event!");
if (event == null) {
- throw new IllegalStateException("Dont throw null events.");
+ throw new IllegalStateException("Don't throw null events.");
}
resetData();
for (TreeModelListener l : listeners) {
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/GUISaveState.java b/src/gui/edu/umd/cs/findbugs/gui2/GUISaveState.java
index 90d5662..6f93d75 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/GUISaveState.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/GUISaveState.java
@@ -53,7 +53,7 @@
*
*/
/*
- * GUISaveState uses the Preferences API, dont look for a file anywhere, there
+ * GUISaveState uses the Preferences API, don't look for a file anywhere, there
* isn't one, well... there might be, but its all system dependent where it is
* and how its stored
*/
@@ -67,7 +67,7 @@
private static final String FRAME_BOUNDS = "Frame Bounds";
private static final String EXTENDED_WINDOW_STATE = "ExtendedWindowState";
- private static final int MAXNUMRECENTPROJECTS = 5;
+ static final int MAXNUMRECENTPROJECTS = 10;
private static final Sortables[] DEFAULT_COLUMN_HEADERS = new Sortables[] { Sortables.CATEGORY, Sortables.BUGCODE,
Sortables.TYPE, Sortables.DIVIDER, Sortables.BUG_RANK, Sortables.FIRST_SEEN, Sortables.DESIGNATION };
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/MainFrame.java b/src/gui/edu/umd/cs/findbugs/gui2/MainFrame.java
index da3d3f6..896215e 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/MainFrame.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/MainFrame.java
@@ -544,7 +544,7 @@
if (bugCollection != null) {
displayer.clearCache();
BugSet bs = new BugSet(bugCollection);
- // Dont clear data, the data's correct, just get the tree off the
+ // Don't clear data, the data's correct, just get the tree off the
// listener lists.
BugTreeModel model = (BugTreeModel) mainFrameTree.getTree().getModel();
model.getOffListenerList();
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/MainFrameLoadSaveHelper.java b/src/gui/edu/umd/cs/findbugs/gui2/MainFrameLoadSaveHelper.java
index 863a103..0066feb 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/MainFrameLoadSaveHelper.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/MainFrameLoadSaveHelper.java
@@ -118,7 +118,7 @@
final File f = saveOpenFileChooser.getSelectedFile();
if (!fileType.isValid(f)) {
- JOptionPane.showMessageDialog(saveOpenFileChooser, "That file is not compatible with the choosen file type",
+ JOptionPane.showMessageDialog(saveOpenFileChooser, "That file is not compatible with the chosen file type",
"Invalid File", JOptionPane.WARNING_MESSAGE);
loading = true;
continue;
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/MainFrameTree.java b/src/gui/edu/umd/cs/findbugs/gui2/MainFrameTree.java
index d4d6902..97fbe25 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/MainFrameTree.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/MainFrameTree.java
@@ -633,7 +633,7 @@
if (!(path.getParentPath() == null)) {
// path is null, the
// root was selected,
- // dont allow them to
+ // don't allow them to
// filter out the root.
branchPopupMenu.show(tree, e.getX(), e.getY());
}
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/NewProjectWizard.java b/src/gui/edu/umd/cs/findbugs/gui2/NewProjectWizard.java
index c6d06cb..6baa13f 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/NewProjectWizard.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/NewProjectWizard.java
@@ -187,7 +187,7 @@
wizardComponents[1] = createFilePanel(
edu.umd.cs.findbugs.L10N.getLocalString("dlg.aux_class_lbl", "Auxiliary class locations:"), auxList, auxModel,
- JFileChooser.FILES_AND_DIRECTORIES, directoryOrArchive, "Choose Auxilliary Class Archives and Directories", false,
+ JFileChooser.FILES_AND_DIRECTORIES, directoryOrArchive, "Choose Auxiliary Class Archives and Directories", false,
"http://findbugs.sourceforge.net/FAQ.html#q4");
wizardComponents[2] = createFilePanel(
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/RecentMenu.java b/src/gui/edu/umd/cs/findbugs/gui2/RecentMenu.java
index d6be279..cf92dfa 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/RecentMenu.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/RecentMenu.java
@@ -30,7 +30,7 @@
public class RecentMenu {
private static class LimitedArrayList extends ArrayList {
- public static final int MAX_ENTRIES = 5;
+ public static final int MAX_ENTRIES = GUISaveState.MAXNUMRECENTPROJECTS;
public LimitedArrayList() {
super(MAX_ENTRIES);
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/SorterTableColumnModel.java b/src/gui/edu/umd/cs/findbugs/gui2/SorterTableColumnModel.java
index be023cf..67ae383 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/SorterTableColumnModel.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/SorterTableColumnModel.java
@@ -287,7 +287,7 @@
public int getColumnIndex(Object columnIdentifier) {
if (columnIdentifier == null) {
- throw new IllegalArgumentException("Dont send null to getColumnIndex, null shouldn't be in the sorting table.");
+ throw new IllegalArgumentException("Don't send null to getColumnIndex, null shouldn't be in the sorting table.");
}
for (int x = 0; x < columnList.size(); x++) {
diff --git a/src/gui/edu/umd/cs/findbugs/gui2/StackedFilterMatcher.java b/src/gui/edu/umd/cs/findbugs/gui2/StackedFilterMatcher.java
index c7dbe78..75fd2c6 100644
--- a/src/gui/edu/umd/cs/findbugs/gui2/StackedFilterMatcher.java
+++ b/src/gui/edu/umd/cs/findbugs/gui2/StackedFilterMatcher.java
@@ -134,7 +134,7 @@
(MainFrame.getInstance().getBugTreeModel()).sendEvent(event, whatToDo);
} catch (BranchOperationException e) {
// Another filter already filters out the branch this filter
- // would filter out, set active, but dont send any tree model
+ // would filter out, set active, but don't send any tree model
// events.
this.active = active;
}
diff --git a/src/java/edu/umd/cs/findbugs/BugInstance.java b/src/java/edu/umd/cs/findbugs/BugInstance.java
index d32ae07..5a0a0bc 100644
--- a/src/java/edu/umd/cs/findbugs/BugInstance.java
+++ b/src/java/edu/umd/cs/findbugs/BugInstance.java
@@ -462,7 +462,7 @@
}
/**
- * Get the primary method annotation, which indicates where the bug occurs.
+ * Get the primary field annotation, which indicates where the bug occurs.
*/
@CheckForNull
public FieldAnnotation getPrimaryField() {
diff --git a/src/java/edu/umd/cs/findbugs/BugRanker.java b/src/java/edu/umd/cs/findbugs/BugRanker.java
index c319871..efdd2c7 100644
--- a/src/java/edu/umd/cs/findbugs/BugRanker.java
+++ b/src/java/edu/umd/cs/findbugs/BugRanker.java
@@ -51,7 +51,7 @@
*
* A bug ranker is comprised of a list of bug patterns, bug kinds and bug
* categories. For each, either an absolute or relative bug rank is provided. A
- * relative rank is one preceeded by a + or -.
+ * relative rank is one preceded by a + or -.
*
* For core bug detectors, the bug ranker search order is:
*
diff --git a/src/java/edu/umd/cs/findbugs/CheckBcel.java b/src/java/edu/umd/cs/findbugs/CheckBcel.java
index 5b60878..2ebc7f0 100644
--- a/src/java/edu/umd/cs/findbugs/CheckBcel.java
+++ b/src/java/edu/umd/cs/findbugs/CheckBcel.java
@@ -78,7 +78,7 @@
* name of the BCEL class
*/
private static void error(String cname) {
- System.err.println("BCEL class compatability error.");
+ System.err.println("BCEL class compatibility error.");
System.err.println("The version of class " + cname + " found was not compatible with\n"
+ "FindBugs. Please remove any BCEL libraries that may be interfering. This may happen\n"
+ "if you have an old version of BCEL or a library that includes an old version of BCEL\n"
diff --git a/src/java/edu/umd/cs/findbugs/ClassAnnotation.java b/src/java/edu/umd/cs/findbugs/ClassAnnotation.java
index a0af44c..420fb6e 100644
--- a/src/java/edu/umd/cs/findbugs/ClassAnnotation.java
+++ b/src/java/edu/umd/cs/findbugs/ClassAnnotation.java
@@ -44,6 +44,8 @@
public static final String SUBCLASS_ROLE = "CLASS_SUBCLASS";
public static final String SUPERCLASS_ROLE = "CLASS_SUPERCLASS";
+
+ public static final String ANONYMOUS_ROLE = "CLASS_ANONYMOUS";
public static final String RECOMMENDED_SUPERCLASS_ROLE = "CLASS_RECOMMENDED_SUPERCLASS";
diff --git a/src/java/edu/umd/cs/findbugs/FieldWarningSuppressor.java b/src/java/edu/umd/cs/findbugs/FieldWarningSuppressor.java
index 3742561..f393b11 100644
--- a/src/java/edu/umd/cs/findbugs/FieldWarningSuppressor.java
+++ b/src/java/edu/umd/cs/findbugs/FieldWarningSuppressor.java
@@ -12,7 +12,7 @@
@Override
public String toString() {
- return String.format("Supress %s in %s.%s", bugPattern, clazz, field);
+ return String.format("Suppress %s in %s.%s", bugPattern, clazz, field);
}
@Override
public boolean match(BugInstance bugInstance) {
diff --git a/src/java/edu/umd/cs/findbugs/FindBugsAnnotationDescriptions.properties b/src/java/edu/umd/cs/findbugs/FindBugsAnnotationDescriptions.properties
index e4ca0a4..8689858 100644
--- a/src/java/edu/umd/cs/findbugs/FindBugsAnnotationDescriptions.properties
+++ b/src/java/edu/umd/cs/findbugs/FindBugsAnnotationDescriptions.properties
@@ -3,6 +3,7 @@
CLASS_REFTYPE =Reference type {0}
CLASS_SUBCLASS =has subclass {0}
CLASS_SUPERCLASS =superclass is {0}
+CLASS_ANONYMOUS =Anonymous class {0}
CLASS_RECOMMENDED_SUPERCLASS =Perhaps class should be refactored to extend {0}
CLASS_IMPLEMENTED_INTERFACE =implements interface {0}
CLASS_ANNOTATION =annotated with {0.simpleName}
diff --git a/src/java/edu/umd/cs/findbugs/FuzzyBugComparator.java b/src/java/edu/umd/cs/findbugs/FuzzyBugComparator.java
index aed1395..d854297 100644
--- a/src/java/edu/umd/cs/findbugs/FuzzyBugComparator.java
+++ b/src/java/edu/umd/cs/findbugs/FuzzyBugComparator.java
@@ -277,7 +277,7 @@
}
/**
- * For now, just look at the 2 preceeding and succeeding opcodes for fuzzy
+ * For now, just look at the 2 preceding and succeeding opcodes for fuzzy
* source line matching.
*/
// private static final int NUM_CONTEXT_OPCODES = 2;
diff --git a/src/java/edu/umd/cs/findbugs/JavaVersion.java b/src/java/edu/umd/cs/findbugs/JavaVersion.java
index f293cf3..536e38f 100644
--- a/src/java/edu/umd/cs/findbugs/JavaVersion.java
+++ b/src/java/edu/umd/cs/findbugs/JavaVersion.java
@@ -19,14 +19,10 @@
package edu.umd.cs.findbugs;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
/**
* Support for finding out what version of Java we're running on.
*/
public class JavaVersion {
- private static final Pattern PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)(\\..*)?$");
private final int major;
@@ -43,9 +39,8 @@
try {
runtimeVersion = new JavaVersion(SystemProperties.getProperty("java.version"));
} catch (JavaVersionException e) {
- System.err.println("Warning: Unknown version of Java");
- // Assume Java 1.0.
- runtimeVersion = new JavaVersion(1, 0);
+ // Assume Java 1.8.
+ runtimeVersion = new JavaVersion(1, 8);
e.printStackTrace();
}
}
@@ -63,17 +58,31 @@
* java.version system property: e.g., "1.4.2_04"
*/
public JavaVersion(String versionString) throws JavaVersionException {
- Matcher matcher = PATTERN.matcher(versionString);
- if (!matcher.matches()) {
- throw new JavaVersionException("Could not parse Java version string: " + versionString);
- }
+ // See https://bugs.openjdk.java.net/browse/JDK-8061493 for http://openjdk.java.net/jeps/223
+ // The only common between pre-9 and 9+ are the dots as separators...
+ String[] strings = versionString.split("\\.", 3);
try {
- major = Integer.parseInt(matcher.group(1));
- minor = Integer.parseInt(matcher.group(2));
- if (matcher.group(3) != null) {
- rest = matcher.group(3);
+ // We need only care about 9+ early access in first segment
+ int earlyAccess = strings[0].indexOf('-');
+ if(earlyAccess > 0){
+ // 9+ early access versions do not follow common scheme above (it would be too easy)
+ // they look like 9-ea+73 and have only one meaningful (major) part for us.
+ major = Integer.parseInt(strings[0].substring(0, earlyAccess));
+ minor = 0;
+ rest = strings[0].substring(earlyAccess);
} else {
- rest = "";
+ major = Integer.parseInt(strings[0]);
+ if(strings.length > 1){
+ minor = Integer.parseInt(strings[1]);
+ if (strings.length > 2) {
+ rest = strings[2];
+ } else {
+ rest = "";
+ }
+ } else {
+ minor = 0;
+ rest = "";
+ }
}
} catch (NumberFormatException e) {
throw new JavaVersionException("Could not parse Java Version string: " + versionString, e);
diff --git a/src/java/edu/umd/cs/findbugs/OpcodeStack.java b/src/java/edu/umd/cs/findbugs/OpcodeStack.java
index 6564b6c..ef986a5 100644
--- a/src/java/edu/umd/cs/findbugs/OpcodeStack.java
+++ b/src/java/edu/umd/cs/findbugs/OpcodeStack.java
@@ -2634,7 +2634,8 @@
i.setSpecialKind(Item.NON_NEGATIVE);
}
push(i);
- } else if("java/lang/String".equals(clsName) && numberArguments == 0 && topItem.getConstant() instanceof String) {
+ } else if("java/lang/String".equals(clsName) && numberArguments == 0 && topItem != null &&
+ topItem.getConstant() instanceof String) {
String input = (String) topItem.getConstant();
Object result;
switch(methodName) {
diff --git a/src/java/edu/umd/cs/findbugs/PluginLoader.java b/src/java/edu/umd/cs/findbugs/PluginLoader.java
index efc3fdb..adaca64 100644
--- a/src/java/edu/umd/cs/findbugs/PluginLoader.java
+++ b/src/java/edu/umd/cs/findbugs/PluginLoader.java
@@ -213,7 +213,7 @@
classLoader = new URLClassLoader(loaderURLs, parent);
} else {
if (parent != PluginLoader.class.getClassLoader()) {
- throw new IllegalArgumentException("Can't specify parentid " + parentId + " and provide a seperate class loader");
+ throw new IllegalArgumentException("Can't specify parentid " + parentId + " and provide a separate class loader");
}
Plugin parentPlugin = Plugin.getByPluginId(parentId);
if (parentPlugin != null) {
diff --git a/src/java/edu/umd/cs/findbugs/StackMapAnalyzer.java b/src/java/edu/umd/cs/findbugs/StackMapAnalyzer.java
index 91b54b7..99ec25c 100644
--- a/src/java/edu/umd/cs/findbugs/StackMapAnalyzer.java
+++ b/src/java/edu/umd/cs/findbugs/StackMapAnalyzer.java
@@ -30,14 +30,14 @@
import javax.annotation.CheckForNull;
-import org.apache.bcel.Constants;
+import org.apache.bcel.Const;
import org.apache.bcel.classfile.Attribute;
import org.apache.bcel.classfile.ClassFormatException;
import org.apache.bcel.classfile.Code;
import org.apache.bcel.classfile.ConstantClass;
import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.StackMapTable;
-import org.apache.bcel.classfile.StackMapTableEntry;
+import org.apache.bcel.classfile.StackMap;
+import org.apache.bcel.classfile.StackMapEntry;
import org.apache.bcel.classfile.StackMapType;
import org.apache.bcel.generic.Type;
@@ -84,20 +84,20 @@
SAME_FRAME, SAME_LOCALS_1_STACK_ITEM_FRAME, CHOP_FRAME, APPEND_FRAME, FULL_FRAME;
static StackFrameType get(int frame_type) {
- if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) {
+ if (frame_type >= Const.SAME_FRAME && frame_type <= Const.SAME_FRAME_MAX) {
return SAME_FRAME;
- } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME
- && frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
+ } else if (frame_type >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME
+ && frame_type <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
return SAME_LOCALS_1_STACK_ITEM_FRAME;
- } else if (frame_type == Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) {
+ } else if (frame_type == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) {
return SAME_LOCALS_1_STACK_ITEM_FRAME;
- } else if (frame_type >= Constants.CHOP_FRAME && frame_type <= Constants.CHOP_FRAME_MAX) {
+ } else if (frame_type >= Const.CHOP_FRAME && frame_type <= Const.CHOP_FRAME_MAX) {
return CHOP_FRAME;
- } else if (frame_type == Constants.SAME_FRAME_EXTENDED) {
+ } else if (frame_type == Const.SAME_FRAME_EXTENDED) {
return SAME_FRAME;
- } else if (frame_type >= Constants.APPEND_FRAME && frame_type <= Constants.APPEND_FRAME_MAX) {
+ } else if (frame_type >= Const.APPEND_FRAME && frame_type <= Const.APPEND_FRAME_MAX) {
return APPEND_FRAME;
- } else if (frame_type == Constants.FULL_FRAME) {
+ } else if (frame_type == Const.FULL_FRAME) {
return FULL_FRAME;
} else {
/* Can't happen */
@@ -106,10 +106,10 @@
}
}
- static @CheckForNull StackMapTable getStackMapTable(Code code) {
+ static @CheckForNull StackMap getStackMapTable(Code code) {
for(Attribute a : code.getAttributes()) {
- if (a instanceof StackMapTable) {
- return (StackMapTable) a;
+ if (a instanceof StackMap) {
+ return (StackMap) a;
}
}
return null;
@@ -143,7 +143,7 @@
@Override
public Field run() {
- Class c = StackMapTableEntry.class;
+ Class c = StackMapEntry.class;
Field result;
try {
result = c.getDeclaredField("frame_type");
@@ -168,7 +168,7 @@
frame_type_field = f;
}
- static int getFrameType(StackMapTableEntry e) {
+ static int getFrameType(StackMapEntry e) {
if (frame_type_field == null) {
return -1;
}
@@ -197,7 +197,7 @@
if (code == null) {
return null;
}
- StackMapTable stackMapTable = getStackMapTable(code);
+ StackMap stackMapTable = getStackMapTable(code);
if (stackMapTable == null) {
return null;
}
@@ -213,8 +213,8 @@
System.out.println(locals);
}
int pc = 0;
- for(StackMapTableEntry e : stackMapTable.getStackMapTable()) {
- pc += e.getByteCodeOffsetDelta();
+ for(StackMapEntry e : stackMapTable.getStackMap()) {
+ pc += e.getByteCodeOffset();
int rawFrameType = getFrameType(e);
StackFrameType stackFrameType = StackFrameType.get(rawFrameType);
switch (stackFrameType) {
@@ -227,7 +227,7 @@
break;
case CHOP_FRAME :
stack.clear();
- int n = Constants.CHOP_FRAME_MAX+1-rawFrameType;
+ int n = Const.CHOP_FRAME_MAX+1-rawFrameType;
for(int i = 0; i < n; i++) {
Item it = locals.remove(locals.size()-1);
if (it == null) {
@@ -277,24 +277,24 @@
switch (t.getType()) {
- case Constants.ITEM_Double:
+ case Const.ITEM_Double:
return Item.typeOnly("D");
- case Constants.ITEM_Float:
+ case Const.ITEM_Float:
return Item.typeOnly("F");
- case Constants.ITEM_Integer:
+ case Const.ITEM_Integer:
return Item.typeOnly("I");
- case Constants.ITEM_Long:
+ case Const.ITEM_Long:
return Item.typeOnly("J");
- case Constants.ITEM_Bogus:
- case Constants.ITEM_NewObject:
+ case Const.ITEM_Bogus:
+ case Const.ITEM_NewObject:
return Item.typeOnly("Ljava/lang/Object;");
- case Constants.ITEM_Null:
+ case Const.ITEM_Null:
Item it = new Item();
it.setSpecialKind(Item.TYPE_ONLY);
return it;
- case Constants.ITEM_InitObject:
+ case Const.ITEM_InitObject:
return Item.typeOnly("Ljava/lang/Object;");
- case Constants.ITEM_Object:
+ case Const.ITEM_Object:
int index = t.getIndex();
ConstantClass c = (ConstantClass) t.getConstantPool().getConstant(index);
String name = c.getBytes(t.getConstantPool());
diff --git a/src/java/edu/umd/cs/findbugs/SwitchHandler.java b/src/java/edu/umd/cs/findbugs/SwitchHandler.java
index 976f1e9..856b0a8 100644
--- a/src/java/edu/umd/cs/findbugs/SwitchHandler.java
+++ b/src/java/edu/umd/cs/findbugs/SwitchHandler.java
@@ -28,7 +28,6 @@
import edu.umd.cs.findbugs.ba.XClass;
import edu.umd.cs.findbugs.ba.XField;
-import edu.umd.cs.findbugs.util.ClassName;
import edu.umd.cs.findbugs.visitclass.DismantleBytecode;
public class SwitchHandler {
@@ -46,10 +45,8 @@
return -1;
}
int total = 0;
- String enumSignature = ClassName.toSignature(c.getClassDescriptor().getClassName());
for(XField f : c.getXFields()) {
- if (f.getSignature().equals(enumSignature)
- && f.isPublic() && f.isFinal()) {
+ if (f.isEnum()) {
total++;
}
}
diff --git a/src/java/edu/umd/cs/findbugs/Version.java b/src/java/edu/umd/cs/findbugs/Version.java
index 40c7905..d515bb9 100644
--- a/src/java/edu/umd/cs/findbugs/Version.java
+++ b/src/java/edu/umd/cs/findbugs/Version.java
@@ -49,12 +49,12 @@
/**
* Minor version number.
*/
- public static final int MINOR = 0;
+ public static final int MINOR = 1;
/**
* Patch level.
*/
- public static final int PATCHLEVEL = 1;
+ public static final int PATCHLEVEL = 0;
/**
* Development version or release candidate?
diff --git a/src/java/edu/umd/cs/findbugs/annotations/Confidence.java b/src/java/edu/umd/cs/findbugs/annotations/Confidence.java
index efeb725..b6ce7a4 100644
--- a/src/java/edu/umd/cs/findbugs/annotations/Confidence.java
+++ b/src/java/edu/umd/cs/findbugs/annotations/Confidence.java
@@ -21,14 +21,14 @@
import javax.annotation.Nonnull;
-import edu.umd.cs.findbugs.Priorities;
-
/**
* Describes the confidence with which FindBugs reports a bug instance.
*/
public enum Confidence {
- HIGH(Priorities.HIGH_PRIORITY), MEDIUM(Priorities.NORMAL_PRIORITY), LOW(Priorities.LOW_PRIORITY), IGNORE(
- Priorities.IGNORE_PRIORITY);
+ HIGH(1 /* Priorities.HIGH_PRIORITY */),
+ MEDIUM(2 /* Priorities.NORMAL_PRIORITY */ ),
+ LOW(3 /* Priorities.LOW_PRIORITY */),
+ IGNORE(5 /*Priorities.IGNORE_PRIORITY */);
private final int confidenceValue;
diff --git a/src/java/edu/umd/cs/findbugs/annotations/DesireWarning.java b/src/java/edu/umd/cs/findbugs/annotations/DesireWarning.java
index e003b7f..3484b2b 100644
--- a/src/java/edu/umd/cs/findbugs/annotations/DesireWarning.java
+++ b/src/java/edu/umd/cs/findbugs/annotations/DesireWarning.java
@@ -7,8 +7,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-
-import edu.umd.cs.findbugs.BugRanker;
/**
* Annotation indicating that a FindBugs warning is desired.
@@ -29,7 +27,7 @@
public Confidence confidence() default Confidence.LOW;
/** Desire a warning at least this scary */
- public int rank() default BugRanker.VISIBLE_RANK_MAX;
+ public int rank() default 20; // BugRanker.VISIBLE_RANK_MAX
/** Desire at least this many warnings */
public int num() default 1;
diff --git a/src/java/edu/umd/cs/findbugs/annotations/ExpectWarning.java b/src/java/edu/umd/cs/findbugs/annotations/ExpectWarning.java
index 5c2abe2..ae6394d 100644
--- a/src/java/edu/umd/cs/findbugs/annotations/ExpectWarning.java
+++ b/src/java/edu/umd/cs/findbugs/annotations/ExpectWarning.java
@@ -7,8 +7,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-
-import edu.umd.cs.findbugs.BugRanker;
/**
* Annotation indicating that a FindBugs warning is expected.
@@ -29,7 +27,7 @@
public Confidence confidence() default Confidence.LOW;
/** Expect a warning at least this scary */
- public int rank() default BugRanker.VISIBLE_RANK_MAX;
+ public int rank() default 20; // BugRanker.VISIBLE_RANK_MAX
/** Expect at least this many warnings */
public int num() default 1;
diff --git a/src/java/edu/umd/cs/findbugs/annotations/NoWarning.java b/src/java/edu/umd/cs/findbugs/annotations/NoWarning.java
index 0f95420..d842339 100644
--- a/src/java/edu/umd/cs/findbugs/annotations/NoWarning.java
+++ b/src/java/edu/umd/cs/findbugs/annotations/NoWarning.java
@@ -7,8 +7,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-
-import edu.umd.cs.findbugs.BugRanker;
/**
* Annotation indicating that no FindBugs warning is expected.
@@ -29,7 +27,7 @@
public Confidence confidence() default Confidence.LOW;
/** Want no warning at this rank or scarier */
- public int rank() default BugRanker.VISIBLE_RANK_MAX;
+ public int rank() default 20; // BugRanker.VISIBLE_RANK_MAX
/** Tolerate up to this many warnings */
public int num() default 0;
diff --git a/src/java/edu/umd/cs/findbugs/annotations/Priority.java b/src/java/edu/umd/cs/findbugs/annotations/Priority.java
index cdfa2e0..bc5a17b 100644
--- a/src/java/edu/umd/cs/findbugs/annotations/Priority.java
+++ b/src/java/edu/umd/cs/findbugs/annotations/Priority.java
@@ -19,7 +19,6 @@
package edu.umd.cs.findbugs.annotations;
-import edu.umd.cs.findbugs.Priorities;
/**
* @author pugh
@@ -27,8 +26,10 @@
*/
@Deprecated
public enum Priority {
- HIGH(Priorities.HIGH_PRIORITY), MEDIUM(Priorities.NORMAL_PRIORITY), LOW(Priorities.LOW_PRIORITY), IGNORE(
- Priorities.IGNORE_PRIORITY);
+ HIGH(1 /* Priorities.HIGH_PRIORITY */),
+ MEDIUM(2 /* Priorities.NORMAL_PRIORITY */ ),
+ LOW(3 /* Priorities.LOW_PRIORITY */),
+ IGNORE(5 /*Priorities.IGNORE_PRIORITY */);
private final int priorityValue;
diff --git a/src/java/edu/umd/cs/findbugs/ba/AbstractField.java b/src/java/edu/umd/cs/findbugs/ba/AbstractField.java
index 203b242..6481875 100644
--- a/src/java/edu/umd/cs/findbugs/ba/AbstractField.java
+++ b/src/java/edu/umd/cs/findbugs/ba/AbstractField.java
@@ -41,6 +41,11 @@
return (getAccessFlags() & Constants.ACC_SYNTHETIC) != 0;
}
+ @Override
+ public boolean isEnum() {
+ return (getAccessFlags() & Constants.ACC_ENUM) != 0;
+ }
+
/*
* (non-Javadoc)
*
diff --git a/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java b/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
index 52468c9..68f3acd 100644
--- a/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
+++ b/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
@@ -50,7 +50,7 @@
* @see Frame
* @see DataflowAnalysis
*/
-public abstract class AbstractFrameModelingVisitor> implements VisitorSupportsInvokeDynamic {
+public abstract class AbstractFrameModelingVisitor> implements Visitor {
private FrameType frame;
private Location location;
diff --git a/src/java/edu/umd/cs/findbugs/ba/AnalysisContext.java b/src/java/edu/umd/cs/findbugs/ba/AnalysisContext.java
index 8b53002..5d45ff3 100644
--- a/src/java/edu/umd/cs/findbugs/ba/AnalysisContext.java
+++ b/src/java/edu/umd/cs/findbugs/ba/AnalysisContext.java
@@ -33,8 +33,6 @@
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-
-import net.jcip.annotations.NotThreadSafe;
import org.apache.bcel.Repository;
import org.apache.bcel.classfile.JavaClass;
@@ -70,6 +68,7 @@
import edu.umd.cs.findbugs.detect.UnreadFieldsData;
import edu.umd.cs.findbugs.internalAnnotations.DottedClassName;
import edu.umd.cs.findbugs.util.ClassName;
+import net.jcip.annotations.NotThreadSafe;
/**
* A context for analysis of a complete project. This serves as the repository
@@ -542,7 +541,12 @@
}
JavaClass clazz = originalRepository.findClass(className);
- return (clazz == null ? originalRepository.loadClass(className) : clazz);
+ if(clazz != null){
+ return clazz;
+ }
+ // XXX workaround for system classes missing on Java 9
+ // Not sure if we BCEL update, but this seem to work in simple cases
+ return AnalysisContext.currentAnalysisContext().lookupClass(className);
}
/**
diff --git a/src/java/edu/umd/cs/findbugs/ba/ClassContext.java b/src/java/edu/umd/cs/findbugs/ba/ClassContext.java
index e0d609b..f844c70 100644
--- a/src/java/edu/umd/cs/findbugs/ba/ClassContext.java
+++ b/src/java/edu/umd/cs/findbugs/ba/ClassContext.java
@@ -807,23 +807,26 @@
if (newLine == lineNum || newLine == -1) {
continue;
}
+
if (prevStartPc >= 0) {
int nextPcInFinallyBlock = pcInFinallyBlock.nextSetBit(prevStartPc);
- if (nextPcInFinallyBlock < line.getStartPC()) {
+ if ( prevStartPc < nextPcInFinallyBlock && nextPcInFinallyBlock < line.getStartPC()) {
lineMentionedMultipleTimes.set(lineNum);
}
}
+
if (line.getStartPC() >= firstHandler) {
afterHandler.set(lineNum);
+ afterHandler.set(newLine);
}
-
lineNum = newLine;
- prevStartPc = line.getStartPC();
+
if (foundOnce.get(lineNum)) {
lineMentionedMultipleTimes.set(lineNum);
} else {
foundOnce.set(lineNum);
}
+ prevStartPc = line.getStartPC();
}
}
lineMentionedMultipleTimes.and(afterHandler);
diff --git a/src/java/edu/umd/cs/findbugs/ba/DefaultNullnessAnnotations.java b/src/java/edu/umd/cs/findbugs/ba/DefaultNullnessAnnotations.java
index ac22356..ef2aaaa 100644
--- a/src/java/edu/umd/cs/findbugs/ba/DefaultNullnessAnnotations.java
+++ b/src/java/edu/umd/cs/findbugs/ba/DefaultNullnessAnnotations.java
@@ -190,7 +190,9 @@
database.addMethodParameterAnnotation("java.util.concurrent.ConcurrentHashMap", "setEntryAt",
"([Ljava/util/concurrent/ConcurrentHashMap$HashEntry;ILjava/util/concurrent/ConcurrentHashMap$HashEntry;)V", false, 1, NullnessAnnotation.NULLABLE);
database.addMethodParameterAnnotation("java.util.concurrent.ForkJoinPool", "",
- "(ILjava/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory;Ljava/lang/Thread$UncaughtExceptionHandler;Z)V", false, 1, NullnessAnnotation.NULLABLE);
+ "(ILjava/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory;Ljava/lang/Thread$UncaughtExceptionHandler;Z)V", false, 1, NullnessAnnotation.NONNULL);
+ database.addMethodParameterAnnotation("java.util.concurrent.ForkJoinPool", "",
+ "(ILjava/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory;Ljava/lang/Thread$UncaughtExceptionHandler;Z)V", false, 2, NullnessAnnotation.NULLABLE);
database.addMethodParameterAnnotation("java.util.concurrent.PriorityBlockingQueue", "",
"(ILjava/util/Comparator;)V", false, 1, NullnessAnnotation.NULLABLE);
diff --git a/src/java/edu/umd/cs/findbugs/ba/Hierarchy2.java b/src/java/edu/umd/cs/findbugs/ba/Hierarchy2.java
index 0ae4fce..804da44 100644
--- a/src/java/edu/umd/cs/findbugs/ba/Hierarchy2.java
+++ b/src/java/edu/umd/cs/findbugs/ba/Hierarchy2.java
@@ -312,6 +312,11 @@
return Collections. emptySet();
}
+ // XXX handle INVOKEDYNAMIC
+ if (opcode == Constants.INVOKEDYNAMIC) {
+ return Collections. emptySet();
+ }
+
Type receiverType;
boolean receiverTypeIsExact;
diff --git a/src/java/edu/umd/cs/findbugs/ba/NullnessAnnotation.java b/src/java/edu/umd/cs/findbugs/ba/NullnessAnnotation.java
index 3babf9f..65c45d7 100644
--- a/src/java/edu/umd/cs/findbugs/ba/NullnessAnnotation.java
+++ b/src/java/edu/umd/cs/findbugs/ba/NullnessAnnotation.java
@@ -48,7 +48,7 @@
return CHECK_FOR_NULL;
}
// Unfortunately there are mixed case Nonnull and NonNull annotations (JSR305, FB and JDT)
- if (className.endsWith("Nonnull")) {
+ if (className.endsWith("Nonnull") || className.equals("org.jetbrains.annotations.NotNull")) {
return NONNULL;
}
for (NullnessAnnotation v : myValues) {
diff --git a/src/java/edu/umd/cs/findbugs/ba/PruneInfeasibleExceptionEdges.java b/src/java/edu/umd/cs/findbugs/ba/PruneInfeasibleExceptionEdges.java
index 6c0a06a..400bac8 100644
--- a/src/java/edu/umd/cs/findbugs/ba/PruneInfeasibleExceptionEdges.java
+++ b/src/java/edu/umd/cs/findbugs/ba/PruneInfeasibleExceptionEdges.java
@@ -61,7 +61,7 @@
}
/**
- * A momento to remind us of how we classified a particular exception edge.
+ * A memento to remind us of how we classified a particular exception edge.
* If pruning and classifying succeeds, then these momentos can be applied
* to actually change the state of the edges. The issue is that the entire
* pruning/classifying operation must either fail or succeed as a whole.
diff --git a/src/java/edu/umd/cs/findbugs/ba/RepositoryClassParser.java b/src/java/edu/umd/cs/findbugs/ba/RepositoryClassParser.java
index fc54152..63efd51 100644
--- a/src/java/edu/umd/cs/findbugs/ba/RepositoryClassParser.java
+++ b/src/java/edu/umd/cs/findbugs/ba/RepositoryClassParser.java
@@ -69,7 +69,7 @@
}
/**
- * Parse the class file into a JavaClass object. If succesful, the new
+ * Parse the class file into a JavaClass object. If successful, the new
* JavaClass is entered into the Repository.
*
* @return the parsed JavaClass
diff --git a/src/java/edu/umd/cs/findbugs/ba/XField.java b/src/java/edu/umd/cs/findbugs/ba/XField.java
index a0c47bb..7d95a8c 100644
--- a/src/java/edu/umd/cs/findbugs/ba/XField.java
+++ b/src/java/edu/umd/cs/findbugs/ba/XField.java
@@ -52,6 +52,11 @@
public boolean isVolatile();
/**
+ * @return true if this is a enum constant
+ */
+ public boolean isEnum();
+
+ /**
* @return FieldDescriptor referring to this field
*/
public FieldDescriptor getFieldDescriptor();
diff --git a/src/java/edu/umd/cs/findbugs/ba/bcp/BindingSet.java b/src/java/edu/umd/cs/findbugs/ba/bcp/BindingSet.java
index 1f2fb3f..10d95e4 100644
--- a/src/java/edu/umd/cs/findbugs/ba/bcp/BindingSet.java
+++ b/src/java/edu/umd/cs/findbugs/ba/bcp/BindingSet.java
@@ -20,7 +20,7 @@
package edu.umd.cs.findbugs.ba.bcp;
/**
- * A set of Bindings, which are definitions of variables occuring in a
+ * A set of Bindings, which are definitions of variables occurring in a
* ByteCodePattern. BindingSets are immutable; to add a binding, a new cell is
* allocated. (Are we CONSING yet?)
*
diff --git a/src/java/edu/umd/cs/findbugs/ba/bcp/FieldAccess.java b/src/java/edu/umd/cs/findbugs/ba/bcp/FieldAccess.java
index 7145ad9..4dd73fc 100644
--- a/src/java/edu/umd/cs/findbugs/ba/bcp/FieldAccess.java
+++ b/src/java/edu/umd/cs/findbugs/ba/bcp/FieldAccess.java
@@ -65,7 +65,7 @@
* @param bindingSet
* previous definitions
* @return a MatchResult containing an updated BindingSet if successful, or
- * null if unsucessful
+ * null if unsuccessful
*/
protected MatchResult checkConsistent(Variable field, Variable value, BindingSet bindingSet) {
// Ensure that the field and value variables are consistent with
diff --git a/src/java/edu/umd/cs/findbugs/ba/jsr305/Analysis.java b/src/java/edu/umd/cs/findbugs/ba/jsr305/Analysis.java
index d1c2d4d..d88926c 100644
--- a/src/java/edu/umd/cs/findbugs/ba/jsr305/Analysis.java
+++ b/src/java/edu/umd/cs/findbugs/ba/jsr305/Analysis.java
@@ -27,6 +27,7 @@
import javax.annotation.meta.When;
import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEDYNAMIC;
import org.apache.bcel.generic.Instruction;
import org.apache.bcel.generic.InvokeInstruction;
@@ -105,8 +106,12 @@
Location location = i.next();
Instruction ins = location.getHandle().getInstruction();
if (ins instanceof InvokeInstruction) {
- XMethod called = XFactory.createXMethod((InvokeInstruction) ins, cpg);
- addEffectiveRelevantQualifiers(result, called);
+ if (ins instanceof INVOKEDYNAMIC) {
+ // TODO handle INVOKEDYNAMIC
+ } else {
+ XMethod called = XFactory.createXMethod((InvokeInstruction) ins, cpg);
+ addEffectiveRelevantQualifiers(result, called);
+ }
}
if (DEBUG_FIND_EFFECTIVE_RELEVANT_QUALIFIERS) {
diff --git a/src/java/edu/umd/cs/findbugs/ba/jsr305/TypeQualifierResolver.java b/src/java/edu/umd/cs/findbugs/ba/jsr305/TypeQualifierResolver.java
index 9098e9c..4e5d913 100644
--- a/src/java/edu/umd/cs/findbugs/ba/jsr305/TypeQualifierResolver.java
+++ b/src/java/edu/umd/cs/findbugs/ba/jsr305/TypeQualifierResolver.java
@@ -55,6 +55,8 @@
static final ClassDescriptor intellijNullable = DescriptorFactory.createClassDescriptor("org/jetbrains/annotations/Nullable");
+ static final ClassDescriptor intellijNotNull = DescriptorFactory.createClassDescriptor("org/jetbrains/annotations/NotNull");
+
static final ClassDescriptor eclipseNullable = DescriptorFactory.createClassDescriptor("org/eclipse/jdt/annotation/Nullable");
static final ClassDescriptor eclipseNonNull = DescriptorFactory.createClassDescriptor("org/eclipse/jdt/annotation/NonNull");
@@ -128,7 +130,8 @@
resolveTypeQualifierNicknames(new AnnotationValue(JSR305NullnessAnnotations.CHECK_FOR_NULL), result, onStack);
return;
}
- if (annotationClass.equals(eclipseNonNull) || annotationClass.equals(eclipseNonNullByDefault)) {
+ if (annotationClass.equals(eclipseNonNull) || annotationClass.equals(eclipseNonNullByDefault)
+ || annotationClass.equals(intellijNotNull)) {
resolveTypeQualifierNicknames(new AnnotationValue(JSR305NullnessAnnotations.NONNULL), result, onStack);
return;
}
diff --git a/src/java/edu/umd/cs/findbugs/ba/npe/NullDerefAndRedundantComparisonFinder.java b/src/java/edu/umd/cs/findbugs/ba/npe/NullDerefAndRedundantComparisonFinder.java
index 9cf9f5c..932754a 100644
--- a/src/java/edu/umd/cs/findbugs/ba/npe/NullDerefAndRedundantComparisonFinder.java
+++ b/src/java/edu/umd/cs/findbugs/ba/npe/NullDerefAndRedundantComparisonFinder.java
@@ -69,7 +69,7 @@
/**
* A user-friendly front end for finding null pointer dereferences and redundant
- * null comparisions.
+ * null comparisons.
*
* @see IsNullValueAnalysis
* @author David Hovemeyer
diff --git a/src/java/edu/umd/cs/findbugs/ba/npe/jdkBaseNonnullReturn.db b/src/java/edu/umd/cs/findbugs/ba/npe/jdkBaseNonnullReturn.db
index 92adda9..4089ae9 100644
--- a/src/java/edu/umd/cs/findbugs/ba/npe/jdkBaseNonnullReturn.db
+++ b/src/java/edu/umd/cs/findbugs/ba/npe/jdkBaseNonnullReturn.db
@@ -4382,7 +4382,6 @@
javax.xml.soap.SOAPMessage,createAttachmentPart,(Ljavax/activation/DataHandler;)Ljavax/xml/soap/AttachmentPart;,1|true
javax.xml.soap.SOAPMessage,getProperty,(Ljava/lang/String;)Ljava/lang/Object;,1|true
javax.xml.soap.SOAPMessage,getSOAPBody,()Ljavax/xml/soap/SOAPBody;,1|true
-javax.xml.soap.SOAPMessage,getSOAPHeader,()Ljavax/xml/soap/SOAPHeader;,1|true
javax.xml.stream.XMLEventFactory,newFactory,()Ljavax/xml/stream/XMLEventFactory;,9|true
javax.xml.stream.XMLEventFactory,newFactory,(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljavax/xml/stream/XMLEventFactory;,9|true
javax.xml.stream.XMLEventFactory,newInstance,()Ljavax/xml/stream/XMLEventFactory;,9|true
diff --git a/src/java/edu/umd/cs/findbugs/ba/obl/ObligationAnalysis.java b/src/java/edu/umd/cs/findbugs/ba/obl/ObligationAnalysis.java
index b52e818..b0bc8cc 100644
--- a/src/java/edu/umd/cs/findbugs/ba/obl/ObligationAnalysis.java
+++ b/src/java/edu/umd/cs/findbugs/ba/obl/ObligationAnalysis.java
@@ -211,7 +211,7 @@
* possiblyLeakedObligation)
*/) {
if (DEBUG_NULL_CHECK) {
- System.out.println("Deleting " + comparedObligation.toString() + " on edge from comparision "
+ System.out.println("Deleting " + comparedObligation.toString() + " on edge from comparison "
+ edge.getSource().getLastInstruction());
}
fact.deleteObligation(comparedObligation, edge.getTarget().getLabel());
diff --git a/src/java/edu/umd/cs/findbugs/ba/type/TypeDataflow.java b/src/java/edu/umd/cs/findbugs/ba/type/TypeDataflow.java
index 060a743..6507be8 100644
--- a/src/java/edu/umd/cs/findbugs/ba/type/TypeDataflow.java
+++ b/src/java/edu/umd/cs/findbugs/ba/type/TypeDataflow.java
@@ -20,6 +20,8 @@
package edu.umd.cs.findbugs.ba.type;
import java.util.Collection;
+
+import javax.annotation.CheckForNull;
import edu.umd.cs.findbugs.ba.CFG;
import edu.umd.cs.findbugs.ba.Dataflow;
@@ -47,6 +49,7 @@
return getAnalysis().getEdgeExceptionSet(edge);
}
+ @CheckForNull
public LocationAndFactPair getLocationAndFactForInstruction(int pc) {
Collection locations = getCFG().getLocationsContainingInstructionWithOffset(pc);
diff --git a/src/java/edu/umd/cs/findbugs/ba/vna/ValueNumberAnalysis.java b/src/java/edu/umd/cs/findbugs/ba/vna/ValueNumberAnalysis.java
index a0ecd9d..4146684 100644
--- a/src/java/edu/umd/cs/findbugs/ba/vna/ValueNumberAnalysis.java
+++ b/src/java/edu/umd/cs/findbugs/ba/vna/ValueNumberAnalysis.java
@@ -169,7 +169,7 @@
if (p == param) {
return getEntryValue(slotOffset);
}
- param++;
+ p++;
slotOffset += SignatureParser.getNumSlotsForType(paramSig);
}
diff --git a/src/java/edu/umd/cs/findbugs/bcel/OpcodeStackDetector.java b/src/java/edu/umd/cs/findbugs/bcel/OpcodeStackDetector.java
index 6cc05e9..a4df989 100644
--- a/src/java/edu/umd/cs/findbugs/bcel/OpcodeStackDetector.java
+++ b/src/java/edu/umd/cs/findbugs/bcel/OpcodeStackDetector.java
@@ -18,6 +18,8 @@
*/
package edu.umd.cs.findbugs.bcel;
+
+import javax.annotation.OverridingMethodsMustInvokeSuper;
import org.apache.bcel.classfile.Code;
@@ -65,6 +67,7 @@
}
@Override
+ @OverridingMethodsMustInvokeSuper
public boolean beforeOpcode(int seen) {
stack.precomputation(this);
return !stack.isTop();
@@ -75,6 +78,7 @@
* @see #sawOpcode(int)
*/
@Override
+ @OverridingMethodsMustInvokeSuper
public void afterOpcode(int seen) {
stack.sawOpcode(this, seen);
}
diff --git a/src/java/edu/umd/cs/findbugs/classfile/analysis/FieldInfo.java b/src/java/edu/umd/cs/findbugs/classfile/analysis/FieldInfo.java
index b975f57..8ea2e86 100644
--- a/src/java/edu/umd/cs/findbugs/classfile/analysis/FieldInfo.java
+++ b/src/java/edu/umd/cs/findbugs/classfile/analysis/FieldInfo.java
@@ -189,6 +189,11 @@
return checkFlag(Constants.ACC_PRIVATE);
}
+ @Override
+ public boolean isEnum() {
+ return checkFlag(Constants.ACC_ENUM);
+ }
+
/*
* (non-Javadoc)
*
diff --git a/src/java/edu/umd/cs/findbugs/classfile/engine/ClassParserUsingASM.java b/src/java/edu/umd/cs/findbugs/classfile/engine/ClassParserUsingASM.java
index 68e3148..b469d49 100644
--- a/src/java/edu/umd/cs/findbugs/classfile/engine/ClassParserUsingASM.java
+++ b/src/java/edu/umd/cs/findbugs/classfile/engine/ClassParserUsingASM.java
@@ -25,7 +25,7 @@
import javax.annotation.CheckForNull;
-import org.apache.bcel.Constants;
+import org.apache.bcel.Const;
import org.objectweb.asm.Attribute;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -60,12 +60,12 @@
private static final BitSet RETURN_OPCODE_SET = new BitSet();
static {
- RETURN_OPCODE_SET.set(Constants.ARETURN);
- RETURN_OPCODE_SET.set(Constants.IRETURN);
- RETURN_OPCODE_SET.set(Constants.LRETURN);
- RETURN_OPCODE_SET.set(Constants.DRETURN);
- RETURN_OPCODE_SET.set(Constants.FRETURN);
- RETURN_OPCODE_SET.set(Constants.RETURN);
+ RETURN_OPCODE_SET.set(Const.ARETURN);
+ RETURN_OPCODE_SET.set(Const.IRETURN);
+ RETURN_OPCODE_SET.set(Const.LRETURN);
+ RETURN_OPCODE_SET.set(Const.DRETURN);
+ RETURN_OPCODE_SET.set(Const.FRETURN);
+ RETURN_OPCODE_SET.set(Const.RETURN);
}
private final ClassReader classReader;
@@ -207,23 +207,23 @@
@Override
public void visitInsn(int opcode) {
switch (opcode) {
- case Constants.MONITORENTER:
+ case Const.MONITORENTER:
mBuilder.setUsesConcurrency();
break;
- case Constants.ARETURN:
- case Constants.IRETURN:
- case Constants.LRETURN:
- case Constants.DRETURN:
- case Constants.FRETURN:
+ case Const.ARETURN:
+ case Const.IRETURN:
+ case Const.LRETURN:
+ case Const.DRETURN:
+ case Const.FRETURN:
if (identityState == IdentityMethodState.LOADED_PARAMETER) {
mBuilder.setIsIdentity();
}
sawReturn = true;
break;
- case Constants.RETURN:
+ case Const.RETURN:
sawReturn = true;
break;
- case Constants.ATHROW:
+ case Const.ATHROW:
if (stubState == StubState.INITIALIZE_RUNTIME) {
sawStubThrow = true;
} else if (justSawInitializationOfUnsupportedOperationException) {
@@ -457,7 +457,7 @@
mBuilder.setUnsupported();
}
if (sawStubThrow) {
- mBuilder.addAccessFlags(Constants.ACC_SYNTHETIC);
+ mBuilder.addAccessFlags(Const.ACC_SYNTHETIC);
mBuilder.setIsStub();
}
@@ -647,24 +647,24 @@
int size;
switch (tag) {
- case Constants.CONSTANT_Methodref:
- case Constants.CONSTANT_InterfaceMethodref:
- case Constants.CONSTANT_Fieldref:
- case Constants.CONSTANT_Integer:
- case Constants.CONSTANT_Float:
- case Constants.CONSTANT_NameAndType:
- case Constants.CONSTANT_InvokeDynamic:
+ case Const.CONSTANT_Methodref:
+ case Const.CONSTANT_InterfaceMethodref:
+ case Const.CONSTANT_Fieldref:
+ case Const.CONSTANT_Integer:
+ case Const.CONSTANT_Float:
+ case Const.CONSTANT_NameAndType:
+ case Const.CONSTANT_InvokeDynamic:
size = 5;
break;
- case Constants.CONSTANT_Long:
- case Constants.CONSTANT_Double:
+ case Const.CONSTANT_Long:
+ case Const.CONSTANT_Double:
size = 9;
count++;
break;
- case Constants.CONSTANT_Utf8:
+ case Const.CONSTANT_Utf8:
size = 3 + classReader.readUnsignedShort(offset + 1);
break;
- case Constants.CONSTANT_Class:
+ case Const.CONSTANT_Class:
@SlashedClassName
String className = classReader.readUTF8(offset + 1, buf);
if (className.indexOf('[') >= 0) {
@@ -675,11 +675,11 @@
}
size = 3;
break;
- case Constants.CONSTANT_String:
- case Constants.CONSTANT_MethodType:
+ case Const.CONSTANT_String:
+ case Const.CONSTANT_MethodType:
size = 3;
break;
- case Constants.CONSTANT_MethodHandle:
+ case Const.CONSTANT_MethodHandle:
size = 4;
break;
default:
diff --git a/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java b/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java
index 7f46704..a9a9808 100644
--- a/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java
+++ b/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java
@@ -26,6 +26,6 @@
*/
public class FindBugsASM {
- public static final int ASM_VERSION = Opcodes.ASM5;
+ public static final int ASM_VERSION = Opcodes.ASM6;
}
diff --git a/src/java/edu/umd/cs/findbugs/classfile/engine/bcel/ValueRangeAnalysisFactory.java b/src/java/edu/umd/cs/findbugs/classfile/engine/bcel/ValueRangeAnalysisFactory.java
index 898f4d2..42fc5e9 100644
--- a/src/java/edu/umd/cs/findbugs/classfile/engine/bcel/ValueRangeAnalysisFactory.java
+++ b/src/java/edu/umd/cs/findbugs/classfile/engine/bcel/ValueRangeAnalysisFactory.java
@@ -21,10 +21,12 @@
import static org.apache.bcel.Constants.*;
+import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
@@ -727,7 +729,7 @@
for (VariableData data : analyzedArguments.values()) {
for (LongRangeSet subRange : data.splitSet) {
BitSet reachedBlocks = new BitSet();
- walkCFG(cfg, cfg.getEntry(), subRange, data.edges, reachedBlocks, new HashSet());
+ walkCFG(cfg, subRange, data.edges, reachedBlocks);
data.reachableBlocks.or(reachedBlocks);
}
}
@@ -893,28 +895,45 @@
return result;
}
- private static void walkCFG(CFG cfg, BasicBlock basicBlock, LongRangeSet subRange, Map edges, BitSet reachedBlocks, Set numbers) {
- reachedBlocks.set(basicBlock.getLabel());
- for (Iterator iterator = cfg.outgoingEdgeIterator(basicBlock); iterator.hasNext();) {
- Edge edge = iterator.next();
- Branch branch = edges.get(edge);
- if (branch != null) {
- branch.numbers.addAll(numbers);
- numbers = new HashSet<>(numbers);
- numbers.add(branch.number.longValue());
- if (branch.trueSet.intersects(subRange)) {
- branch.trueReachedSet.add(subRange);
- } else {
- branch.falseReachedSet.add(subRange);
- continue;
- }
- }
- BasicBlock target = edge.getTarget();
- if (!reachedBlocks.get(target.getLabel())) {
- walkCFG(cfg, target, subRange, edges, reachedBlocks, numbers);
- }
- if (branch != null) {
- break;
+ private static void walkCFG(final CFG cfg, LongRangeSet subRange, Map edges, final BitSet reachedBlocks) {
+ class WalkState {
+ Set numbers;
+ BasicBlock target;
+
+ WalkState(Set numbers, BasicBlock target) {
+ reachedBlocks.set(target.getLabel());
+ this.target = target;
+ this.numbers = numbers;
+ }
+ }
+
+ Deque walkStates = new ArrayDeque<>();
+ walkStates.push(new WalkState(new HashSet(), cfg.getEntry()));
+
+ while(!walkStates.isEmpty()) {
+ WalkState walkState = walkStates.removeLast();
+ Set numbers = walkState.numbers;
+ for(Iterator iterator = cfg.outgoingEdgeIterator(walkState.target); iterator.hasNext(); ) {
+ Edge edge = iterator.next();
+ Branch branch = edges.get(edge);
+ if (branch != null) {
+ branch.numbers.addAll(numbers);
+ numbers = new HashSet<>(numbers);
+ numbers.add(branch.number.longValue());
+ if (branch.trueSet.intersects(subRange)) {
+ branch.trueReachedSet.add(subRange);
+ } else {
+ branch.falseReachedSet.add(subRange);
+ continue;
+ }
+ }
+ BasicBlock target = edge.getTarget();
+ if (!reachedBlocks.get(target.getLabel())) {
+ walkStates.push(new WalkState(numbers, target));
+ }
+ if (branch != null) {
+ break;
+ }
}
}
}
diff --git a/src/java/edu/umd/cs/findbugs/classfile/impl/ClassFactory.java b/src/java/edu/umd/cs/findbugs/classfile/impl/ClassFactory.java
index 4e38c82..2fa8dbe 100644
--- a/src/java/edu/umd/cs/findbugs/classfile/impl/ClassFactory.java
+++ b/src/java/edu/umd/cs/findbugs/classfile/impl/ClassFactory.java
@@ -117,6 +117,8 @@
throw new IOException("File " + file.getAbsolutePath() + " is not a normal file");
} else if (fileName.endsWith(".class")) {
return new SingleFileCodeBase(codeBaseLocator, fileName);
+ } else if (fileName.endsWith(File.separator + "jrt-fs.jar")) {
+ return new JrtfsCodeBase(codeBaseLocator, fileName);
} else {
return ZipCodeBaseFactory.makeZipCodeBase(codeBaseLocator, file);
}
diff --git a/src/java/edu/umd/cs/findbugs/classfile/impl/ClassPathBuilder.java b/src/java/edu/umd/cs/findbugs/classfile/impl/ClassPathBuilder.java
index edabb67..d585743 100644
--- a/src/java/edu/umd/cs/findbugs/classfile/impl/ClassPathBuilder.java
+++ b/src/java/edu/umd/cs/findbugs/classfile/impl/ClassPathBuilder.java
@@ -25,6 +25,9 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -38,6 +41,7 @@
import java.util.jar.Manifest;
import edu.umd.cs.findbugs.FindBugs;
+import edu.umd.cs.findbugs.JavaVersion;
import edu.umd.cs.findbugs.SystemProperties;
import edu.umd.cs.findbugs.classfile.CheckedAnalysisException;
import edu.umd.cs.findbugs.classfile.ClassDescriptor;
@@ -273,6 +277,12 @@
dumpCodeBaseList(classPath.appCodeBaseIterator(), "Application codebases");
dumpCodeBaseList(classPath.auxCodeBaseIterator(), "Auxiliary codebases");
}
+
+ // Make sure we always know if we can't find system classes
+ ICodeBaseEntry resource = classPath.lookupResource("java/lang/Object.class");
+ if(resource == null){
+ throw new ResourceNotFoundException("java/lang/Object.class");
+ }
}
/**
@@ -390,7 +400,18 @@
}
}
+ if(isJava9orLater()){
+ Path jrtFsJar = Paths.get(System.getProperty("java.home", ""), "jrt-fs.jar");
+ if(Files.isRegularFile(jrtFsJar)){
+ addWorkListItemsForClasspath(workList, jrtFsJar.toString());
+ }
+ }
return workList;
+ }
+
+ private static boolean isJava9orLater() {
+ JavaVersion javaVersion = JavaVersion.getRuntimeVersion();
+ return javaVersion.getMajor() >= 9;
}
/**
@@ -628,7 +649,11 @@
} catch (IOException e) {
if (item.isAppCodeBase() || item.getHowDiscovered() == ICodeBase.Discovered.SPECIFIED) {
if (e instanceof FileNotFoundException) {
- errorLogger.logError("File not found: " + item.getCodeBaseLocator());
+ if(item.isAppCodeBase()){
+ errorLogger.logError("File from project not found: " + item.getCodeBaseLocator(), e);
+ } else {
+ errorLogger.logError("File from auxiliary classpath not found: " + item.getCodeBaseLocator(), e);
+ }
} else {
errorLogger.logError("Cannot open codebase " + item.getCodeBaseLocator(), e);
}
diff --git a/src/java/edu/umd/cs/findbugs/classfile/impl/JrtfsCodeBase.java b/src/java/edu/umd/cs/findbugs/classfile/impl/JrtfsCodeBase.java
new file mode 100644
index 0000000..530dc2e
--- /dev/null
+++ b/src/java/edu/umd/cs/findbugs/classfile/impl/JrtfsCodeBase.java
@@ -0,0 +1,332 @@
+/*
+ * FindBugs - Find Bugs in Java programs
+ * Copyright (C) 2003-2008 University of Maryland
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package edu.umd.cs.findbugs.classfile.impl;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import edu.umd.cs.findbugs.classfile.ClassDescriptor;
+import edu.umd.cs.findbugs.classfile.DescriptorFactory;
+import edu.umd.cs.findbugs.classfile.ICodeBaseEntry;
+import edu.umd.cs.findbugs.classfile.ICodeBaseIterator;
+import edu.umd.cs.findbugs.classfile.ICodeBaseLocator;
+import edu.umd.cs.findbugs.classfile.InvalidClassFileFormatException;
+import edu.umd.cs.findbugs.classfile.ResourceNotFoundException;
+
+/**
+ *
+ * Code base supporting Java 9 new jimage packed modules
+ *
+ * @author andrey
+ */
+public class JrtfsCodeBase extends AbstractScannableCodeBase {
+
+ private FileSystem fs;
+ private final String fileName;
+ private Path root;
+
+ /**
+ * Key is package name in bytecode notation (e.g. 'java/lang').
+ *
