This is an automated email from the ASF dual-hosted git repository.

stbischof pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git

commit a0fffe64fb4f9b9dfcea89327c79f5554441cc6e
Author: Stefan Bischof <stbisc...@bipolis.org>
AuthorDate: Sat Apr 5 10:00:10 2025 +0200

    [fw] rm nullcheck on instanceof
    
    Signed-off-by: Stefan Bischof <stbisc...@bipolis.org>
---
 .../src/main/java/org/apache/felix/framework/BundleWiringImpl.java      | 2 +-
 .../java/org/apache/felix/framework/capabilityset/CapabilitySet.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java 
b/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
index bdccaff742..cff58812e2 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
@@ -1488,7 +1488,7 @@ public class BundleWiringImpl implements BundleWiring
                         for (BundleRevision revision : revisions)
                         {
                             ClassLoader loader = 
revision.getWiring().getClassLoader();
-                            if (loader != null && loader instanceof 
BundleClassLoader)
+                            if (loader instanceof BundleClassLoader)
                             {
                                 BundleClassLoader bundleClassLoader = 
(BundleClassLoader) loader;
                                 result = 
bundleClassLoader.findLoadedClassInternal(name);
diff --git 
a/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
 
b/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
index 238a51d99f..5790e08513 100644
--- 
a/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
+++ 
b/framework/src/main/java/org/apache/felix/framework/capabilityset/CapabilitySet.java
@@ -401,7 +401,7 @@ public class CapabilitySet
                 //Do nothing will check later if rhs is null
             }
 
-            if(rhs != null && rhs instanceof VersionRange)
+            if(rhs instanceof VersionRange)
             {
                 return ((VersionRange)rhs).includes((Version)lhs);
             }

Reply via email to