Changeset 13488 for trunk/Jav_GE/com/scenari/m/ge/donnee/WDonneeNavOutline.java

Timestamp:

07/05/09 11:43:40 (3 years ago)

Author:

sys

Message:

memLeak : purge ref au dialogue en cours.

File:

• trunk/Jav_GE/com/scenari/m/ge/donnee/WDonneeNavOutline.java (modified) (1 diff)

trunk/Jav_GE/com/scenari/m/ge/donnee/WDonneeNavOutline.java

@@ -545 +545 @@
         protected final synchronized String xGetValue(IHDialog pDialog, Object pOwner, Object pArguments, Writer pWriter) throws Exception {
                 fWalker.setCurrentDialog((IWADialog) pDialog);
-                fWalker.gotoCurrent();
-                if (xNavSteps(fSteps)) {
-                        if (pWriter == null) {
-                                return fWalker.getDialogUrl();
-                        } else {
-                                pWriter.write(fWalker.getDialogUrl());
-                                return null;
-                        }
-                } else if (fIfNoneSteps != null) {
-                        for (int i = 0; i < fIfNoneSteps.length; i++) {
-                                fWalker.gotoCurrent();
-                                if (xNavSteps(fIfNoneSteps[i])) {
-                                        if (pWriter == null) {
-                                                return fWalker.getDialogUrl();
-                                        } else {
-                                                pWriter.write(fWalker.getDialogUrl());
-                                                return null;
+                try {
+                        fWalker.gotoCurrent();
+                        if (xNavSteps(fSteps)) {
+                                if (pWriter == null) {
+                                        return fWalker.getDialogUrl();
+                                } else {
+                                        pWriter.write(fWalker.getDialogUrl());
+                                        return null;
+                                }
+                        } else if (fIfNoneSteps != null) {
+                                for (int i = 0; i < fIfNoneSteps.length; i++) {
+                                        fWalker.gotoCurrent();
+                                        if (xNavSteps(fIfNoneSteps[i])) {
+                                                if (pWriter == null) {
+                                                        return fWalker.getDialogUrl();
+                                                } else {
+                                                        pWriter.write(fWalker.getDialogUrl());
+                                                        return null;
+                                                }
                                         }
                                 }
                         }
+                } finally {
+                        fWalker.setCurrentDialog(null);
                 }
                 return "";