Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Commit c32bd49

Browse files
author
Emmanuel Hugonnet
committed
Allowing for empty or null password
1 parent 581fa5f commit c32bd49

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

src/main/java/org/silverpeas/openoffice/Launcher.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,24 @@
2020
*/
2121
package org.silverpeas.openoffice;
2222

23-
import org.silverpeas.openoffice.util.MessageDisplayer;
24-
import org.silverpeas.openoffice.util.MessageUtil;
25-
import org.silverpeas.openoffice.util.MsOfficeType;
26-
import org.silverpeas.openoffice.util.OsEnum;
27-
import org.silverpeas.openoffice.util.PasswordManager;
28-
import org.silverpeas.openoffice.util.UrlExtractor;
29-
import org.silverpeas.openoffice.windows.MsOfficePathFinder;
3023
import java.io.IOException;
3124
import java.net.MalformedURLException;
3225
import java.net.URL;
3326
import java.util.logging.Level;
3427
import java.util.logging.Logger;
28+
3529
import javax.activation.MimetypesFileTypeMap;
3630
import javax.swing.UIManager;
3731
import javax.swing.UnsupportedLookAndFeelException;
3832

33+
import org.silverpeas.openoffice.util.MessageDisplayer;
34+
import org.silverpeas.openoffice.util.MessageUtil;
35+
import org.silverpeas.openoffice.util.MsOfficeType;
36+
import org.silverpeas.openoffice.util.OsEnum;
37+
import org.silverpeas.openoffice.util.PasswordManager;
38+
import org.silverpeas.openoffice.util.UrlExtractor;
39+
import org.silverpeas.openoffice.windows.MsOfficePathFinder;
40+
3941
/**
4042
* @author Emmanuel Hugonnet
4143
*/

src/main/java/org/silverpeas/openoffice/util/PasswordManager.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,12 @@ public static String encodePassword(String password) throws UnsupportedEncodingE
9696
*/
9797
public static AuthenticationInfo extractAuthenticationInfo(String login, String encodedPassword) {
9898
try {
99-
char[] clearPwd = decodePassword(encodedPassword);
99+
char[] clearPwd;
100+
if (encodedPassword != null && !encodedPassword.isEmpty()) {
101+
clearPwd = decodePassword(encodedPassword);
102+
} else {
103+
clearPwd = new char[0];
104+
}
100105
if (clearPwd.length <= 0) {
101106
clearPwd = promptForpassword();
102107
}

0 commit comments

Comments
 (0)