From 0f88b78b378ac39f0c9ad5d2926404497d5bf4c9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 19:04:23 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
index 12ba993..97db78a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
@@ -39,10 +39,10 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
+import java.io.InterruptedIOException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
-import javax.naming.InterruptedNamingException;
import javax.swing.ButtonGroup;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
@@ -1463,18 +1463,20 @@
private boolean isInterruptedException(Throwable t)
{
- boolean isInterruptedException = false;
- isInterruptedException = t instanceof java.io.InterruptedIOException ||
- t instanceof InterruptedNamingException;
+ boolean isInterruptedException = isInterrupted(t);
while (t != null && !isInterruptedException)
{
t = t.getCause();
- isInterruptedException = t instanceof java.io.InterruptedIOException ||
- t instanceof InterruptedNamingException;
+ isInterruptedException = isInterrupted(t);
}
return isInterruptedException;
}
+ private boolean isInterrupted(Throwable t)
+ {
+ return t instanceof InterruptedIOException || t instanceof InterruptedException;
+ }
+
private void refreshClicked()
{
// Refresh the contents of the selected entry.
--
Gitblit v1.10.0