Skip to content

Commit 5d1b4b8

Browse files
authored
Merge pull request #17665 from iterate-ch/bugfix/MD-24982-factory
Fix occasional class cast exception when instantiating from factory w…
2 parents 5860f97 + cd097d7 commit 5d1b4b8

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

osx/src/main/java/ch/cyberduck/ui/cocoa/callback/PromptCertificateIdentityCallback.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,13 @@ public class PromptCertificateIdentityCallback implements CertificateIdentityCal
5353

5454
public PromptCertificateIdentityCallback(final ProxyController controller) {
5555
this.controller = controller;
56-
this.window = null;
57-
}
56+
if(controller instanceof WindowController) {
57+
this.window = ((WindowController) controller).window();
58+
}
59+
else {
60+
this.window = null;
5861

59-
public PromptCertificateIdentityCallback(final WindowController controller) {
60-
this.controller = controller;
61-
this.window = controller.window();
62+
}
6263
}
6364

6465
@Override

osx/src/main/java/ch/cyberduck/ui/cocoa/callback/PromptCertificateTrustCallback.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,13 @@ public class PromptCertificateTrustCallback implements CertificateTrustCallback
5252

5353
public PromptCertificateTrustCallback(final ProxyController controller) {
5454
this.controller = controller;
55-
this.window = null;
56-
}
55+
if(controller instanceof WindowController) {
56+
this.window = ((WindowController) controller).window();
57+
}
58+
else {
59+
this.window = null;
5760

58-
public PromptCertificateTrustCallback(final WindowController controller) {
59-
this.controller = controller;
60-
this.window = controller.window();
61+
}
6162
}
6263

6364
@Override

osx/src/main/java/ch/cyberduck/ui/cocoa/callback/PromptLoginCallback.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,14 @@ public class PromptLoginCallback extends PromptPasswordCallback implements Login
6464
public PromptLoginCallback(final ProxyController controller) {
6565
super(controller);
6666
this.controller = controller;
67-
this.window = null;
68-
}
67+
if(controller instanceof WindowController) {
68+
this.window = ((WindowController) controller).window();
69+
}
70+
else {
71+
this.window = null;
6972

70-
public PromptLoginCallback(final WindowController controller) {
71-
super(controller);
72-
this.controller = controller;
73-
this.window = controller.window();
73+
}
7474
}
75-
7675
@Override
7776
public void await(final CountDownLatch signal, final Host bookmark, final String title, final String message) throws ConnectionCanceledException {
7877
log.debug("Display progress alert for {}", bookmark);

0 commit comments

Comments
 (0)