Attachment 158913 Details for Bug 247215 – cvs diff (directoryconsole)

[patch] cvs diff (directoryconsole)

directoryconsole.diff (text/plain), 1.94 KB, created by Noriko Hosoi on 2007-07-10 22:55:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-07-10 22:55:55 UTC

Size: 1.94 KB

patch

obsolete

>Index: src/com/netscape/admin/dirserv/DSAdmin.java
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 DSAdmin.java
>--- src/com/netscape/admin/dirserv/DSAdmin.java	2 Jul 2007 19:44:08 -0000	1.4
>+++ src/com/netscape/admin/dirserv/DSAdmin.java	10 Jul 2007 22:50:25 -0000
>@@ -985,14 +985,24 @@
>                 Debug.println ("DSAdmin:removeServer:sieDN:" + sieDN);
>                 LDAPEntry sieEntry = null;
>                 try {
>                         sieEntry = ldc.read( sieDN, attrs );
>+                } catch (LDAPException ex ) {
>+                        Debug.println( "DSAdmin:removeServer <" + sieDN + "> " + ex);
>+                        // Ignore the no such object error; sieEntry is already removed
>+                        if (ex.getLDAPResultCode() == ex.NO_SUCH_OBJECT) {
>+                                status = true;
>+                        } else {
>+                                args[1] = ex.toString();
>+                                DSUtil.showErrorDialog(frame, "removeinstance", args);
>+                                _removed = false; // problem reading sieEntry
>+                                return false;
>+                        }
>                 } catch (Exception ex ) {
>                         Debug.println( "DSAdmin:removeServer <" + sieDN + "> " + ex);
>                         args[1] = ex.toString();
>-                        DSUtil.showErrorDialog(frame, "removeinstance",
>-                                                                   args);
>-                        _removed = false; // remove failed
>+                        DSUtil.showErrorDialog(frame, "removeinstance", args);
>+                        _removed = false; // problem reading sieEntry
>                         return false;
>                 }
>                 if (sieEntry != null )  {
>                         try {

Actions: View | Diff

Attachments on bug 247215: 158634 | 158635 | 158676 | 158876 | 158879 | 158913 | 158917 | 158918 | 158919 | 159392 | 159393 | 159487 | 160087