From 871724592278440732fbe1c35380bb7bae1bfea8 Mon Sep 17 00:00:00 2001
From: Roman Koldaev <harp07@mail.ru>
Date: Mon, 4 Dec 2023 17:52:40 +0400
Subject: [PATCH] dnsjava NullPointerException bug fixed

---
 pom.xml                                              |  6 +++---
 .../java/jpacketgenerator/JPacketGeneratorGUI.java   |  2 +-
 src/main/java/my/harp07/PjFrame.java                 |  2 +-
 src/main/java/my/harp07/PjLocal.java                 | 12 ++++++++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe2607b..489c52a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,13 +48,13 @@
         <dependency>
             <groupId>com.formdev</groupId>
             <artifactId>flatlaf</artifactId>
-            <version>2.6</version>
+            <version>3.2.5</version>
         </dependency>        
         
         <dependency>
             <groupId>com.formdev</groupId>
             <artifactId>flatlaf-intellij-themes</artifactId>
-            <version>2.6</version>
+            <version>3.2.5</version>
         </dependency>                  
         -->
         <dependency>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>dnsjava</groupId>
             <artifactId>dnsjava</artifactId>
-            <version>2.1.9</version>
+            <version>3.5.3</version>
         </dependency>           
 
         <dependency>
diff --git a/src/main/java/jpacketgenerator/JPacketGeneratorGUI.java b/src/main/java/jpacketgenerator/JPacketGeneratorGUI.java
index a4dd154..d20ca84 100644
--- a/src/main/java/jpacketgenerator/JPacketGeneratorGUI.java
+++ b/src/main/java/jpacketgenerator/JPacketGeneratorGUI.java
@@ -31,7 +31,7 @@ public JPacketGeneratorGUI() throws SocketException, UnsupportedLookAndFeelExcep
         ImageIcon icone = new ImageIcon(getClass().getResource("/FrameIcon-3.png"));
         this.setIconImage(icone.getImage());        
         this.setSize(350, 280);
-        this.setLocation(222, 222);
+        this.setLocation(333, 333);
     }
     
     private void initSourceAddress() throws SocketException {
diff --git a/src/main/java/my/harp07/PjFrame.java b/src/main/java/my/harp07/PjFrame.java
index 4150c00..f14929f 100644
--- a/src/main/java/my/harp07/PjFrame.java
+++ b/src/main/java/my/harp07/PjFrame.java
@@ -65,7 +65,7 @@ public class PjFrame extends javax.swing.JFrame {
     public static String currentLAF = "de.muntjak.tinylookandfeel.TinyLookAndFeel";
     public static String currentTheme = "lib/themes/Default.theme";
     public static List<String> tinyTemes = new ArrayList<>();
-    public static String zagolovok = "Pure Java Network Tools,  v1.0.94, build 03-12-2023";
+    public static String zagolovok = "Pure Java Network Tools,  v1.0.95, build 04-12-2023";
 
     public PjFrame() {
         initComponents();
diff --git a/src/main/java/my/harp07/PjLocal.java b/src/main/java/my/harp07/PjLocal.java
index 435d0da..2d3ecf8 100644
--- a/src/main/java/my/harp07/PjLocal.java
+++ b/src/main/java/my/harp07/PjLocal.java
@@ -8,6 +8,7 @@
 import javax.swing.JTextArea;
 import org.apache.commons.lang3.StringUtils;
 import org.xbill.DNS.ResolverConfig;
+//import sun.net.dns.ResolverConfiguration;
 
 public class PjLocal {
 
@@ -47,13 +48,20 @@ public static void runLocalInfo(JTextArea ta) {
                 }
                 j++;
             }
-        } catch (SocketException | NullPointerException ex) {
+        } catch (Exception ex) {
             //Logger.getLogger(CdiSysInfo.class.getName()).log(Level.SEVERE, null, ex);
         }
         info = info + "-----------\nLocal DNS-servers:\n";
-        Arrays.asList(ResolverConfig.getCurrentConfig().servers())
+        // throw NullPointerException !!!
+        try {
+            //Arrays.asList(ResolverConfiguration.open().nameservers())
+            ResolverConfig.getCurrentConfig().servers()
                 .stream()
                 .forEach(x -> info = info + x + "\n");
+            //System.out.println(ResolverConfig.getCurrentConfig().servers());
+        } catch (Exception ee) {
+            info = info + "no DNS-servers\n";
+        }
         info = info + "\n";
         ta.setText(info);
     }