From 986a6ef713280bd2b54718cdedec83ce0f9422d9 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 29 Jul 2008 10:22:03 +0000
Subject: [PATCH] Fix typos that led to inappropriate testing and possible NPE
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java | 2 +-
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 1 +
opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java | 2 +-
opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 3c622d1..56b1d89 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -3942,6 +3942,7 @@
{
suffixes.add(replica.getSuffix());
}
+ // BUG: suf can be null here below
getUserData().setSuffixesToReplicateOptions(
new SuffixesToReplicateOptions(type, suffixes, suf.getSuffixes()));
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index 3d5a27a..28bfdeb 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -376,7 +376,7 @@
String serverToConnectDisplay;
AuthenticationData authData =
userInstallData.getReplicationOptions().getAuthenticationData();
- if (userInstallData != null)
+ if (authData != null)
{
serverToConnectDisplay = authData.getHostName()+":"+authData.getPort();
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
index 03f8e11..5bb61a7 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
@@ -223,7 +223,7 @@
AuthenticationData authData =
data.getReplicationOptions().getAuthenticationData();
String newServerDisplay;
- if (data != null)
+ if (authData != null)
{
newServerDisplay = authData.getHostName()+":"+authData.getPort();
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
index fc1066a..aae7190 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
@@ -261,7 +261,7 @@
AuthenticationData authData =
data.getReplicationOptions().getAuthenticationData();
String newServerDisplay;
- if (data != null)
+ if (authData != null)
{
newServerDisplay = authData.getHostName()+":"+authData.getPort();
}
--
Gitblit v1.10.0