Skip to content

Commit f74a86d

Browse files
committed
Merge branch 'findbugs' into spotbugs
Conflicts: yank.csv
2 parents 11fa4da + 1faf46b commit f74a86d

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

src/main/java/com/mebigfatguy/fbcontrib/detect/EnumIssues.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ public void sawOpcode(int seen) {
138138
if (variableTable != null && stack.getStackDepth() >= 1) {
139139
OpcodeStack.Item item = stack.getStackItem(0);
140140
if (item.isNull()) {
141-
int reg = RegisterUtils.getAStoreReg(this, seen);
142141
LocalVariable lv = getMethod().getLocalVariableTable()
143142
.getLocalVariable(RegisterUtils.getAStoreReg(this, seen), getNextPC());
144143
if (lv != null) {

yank.csv

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ com.google.inject,guice,4.1.0,eeb69005da379a10071aa4948c48d89250febb07,,,,
2727
,,,,,,,
2828
--- Jars for Samples,,,,,,,----
2929
,,,,,,,
30-
org.apache.commons,commons-lang3,3.4,5fe28b9518e58819180a43a850fbc0dd24b7c050,,,,
31-
,,,,,,,
32-
javax.servlet.jsp,javax.servlet.jsp-api,2.3.1,95c630902565feda8155eb32d46064ef348435fc,,,,
33-
,,,,,,,
34-
junit,junit,4.12,2973d150c0dc1fefe998f834810d68f278ea58ec,,,,
35-
,,,,,,,
30+
org.apache.commons,commons-lang3,3.14.0,1ed471194b02f2c6cb734a0cd6f6f107c673afae,
31+
,,,,
32+
javax.servlet.jsp,javax.servlet.jsp-api,2.3.3,81191ab80e342912dc9cea735c30ff4eddc64de3,
33+
,,,,
34+
junit,junit,4.13.2,8ac9e16d933b6fb43bc7f576336b8f4d7eb5ba12,
35+
,,,,
3636
log4j,log4j,1.2.17,5af35056b4d257e4b64b9e8069c0746e8b08629f,,,,
3737
,,,,,,,
3838
org.apache.logging.log4j,log4j-api,2.9.1,7a2999229464e7a324aa503c0a52ec0f05efe7bd,,,,
3939
,,,,,,,
40-
javax.servlet,javax.servlet-api,3.1.0,3cd63d075497751784b2fa84be59432f4905bf7c,,,,
41-
,,,,,,,
40+
javax.servlet,javax.servlet-api,4.0.1,a27082684a2ff0bf397666c3943496c44541d1ca,
41+
,,,,
4242
backport-util-concurrent,backport-util-concurrent,3.1,682f7ac17fed79e92f8e87d8455192b63376347b,,,,
4343
,,,,,,,
4444
org.threeten,threetenbp,1.3.2,6ef0f1feae9c5b5cce4b3478e8f1541d1c86ec2a,,,,
@@ -47,8 +47,8 @@ commons-collections,commons-collections,3.2.2,8ad72fe39fa8c91eaaf12aadb21e0c3661
4747
,,,,,,,
4848
org.slf4j,slf4j-api,1.7.21,139535a69a4239db087de9bab0bee568bf8e0b70,,,,
4949
,,,,,,,
50-
com.google.guava,guava,19.0,6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9,,,,
51-
,,,,,,,
50+
com.google.guava,guava,33.0.0-jre,161ba27964a62f241533807a46b8711b13c1d94b,
51+
,,,,
5252
org.apache.httpcomponents,httpclient,4.5.2,733db77aa8d9b2d68015189df76ab06304406e50,,,,
5353
,httpcore,4.4.5,e7501a1b34325abb00d17dde96150604a0658b54,,,,
5454
,httpclient-cache,4.5.2,bd50ea83908dbf2f387a333216e66d2f0c5079bd,,,,
@@ -65,8 +65,8 @@ org.springframework,spring-tx,4.3.3.RELEASE,15fe147d2725b9b85bfe79817dc10b4246d0
6565
,,,,,,,
6666
org.eclipse.persistence,javax.persistence,2.1.1,4954fdf995d5083a1bdbf171ea3b240b88c85bac,,,,
6767
,,,,,,,
68-
commons-io,commons-io,2.4,b1b6ea3b7e4aa4f492509a4952029cd8e48019ad,,,,
69-
,,,,,,,
68+
commons-io,commons-io,2.15.1,f11560da189ab563a5c8e351941415430e9304ea,
69+
,,,,
7070
org.mockito,mockito-core,2.23.4,a35b6f8ffcfa786771eac7d7d903429e790fdf3f,,,,
7171
,,,,,,,
7272
net.bytebuddy,byte-buddy,1.6.14,871c3e49dc6183d0d361601c2f1d11abb1a6b48c,,,,

0 commit comments

Comments
 (0)