[incubator-netbeans] branch master updated: [NETBEANS-1775] Fix for NPE

[ma...@apache.org]

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

matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new cc23fcf  [NETBEANS-1775] Fix for NPE
     new 8b7f076  Merge pull request #1189 from lbruun/NETBEANS-1775-fix
cc23fcf is described below

commit cc23fcf0e4c9d626109237d078c942661d80f00b
Author: lbruun <lb...@apache.org>
AuthorDate: Sun Apr 7 19:38:22 2019 +0200

    [NETBEANS-1775] Fix for NPE
    
    Simple typo: '&' should have been '&&'. This caused an NPE
    when NetBeans was used with a VPN connection.
---
 .../src/org/netbeans/core/network/utils/LocalAddressUtils.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/core.network/src/org/netbeans/core/network/utils/LocalAddressUtils.java b/platform/core.network/src/org/netbeans/core/network/utils/LocalAddressUtils.java
index 423ef4b..a2a57cf 100644
--- a/platform/core.network/src/org/netbeans/core/network/utils/LocalAddressUtils.java
+++ b/platform/core.network/src/org/netbeans/core/network/utils/LocalAddressUtils.java
@@ -521,7 +521,7 @@ public class LocalAddressUtils {
             // (above from VirtualBox source code)
             //
             byte[] macAddress = nif.getHardwareAddress();
-            if (macAddress != null & macAddress.length >= 3) {
+            if (macAddress != null && macAddress.length >= 3) {
                 if ((macAddress[0] == 0x0A || macAddress[0] == 0x08) &&
                         (macAddress[1] == 0x00) &&
                         (macAddress[2] == 0x27)) {                


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists