Index: src/main/java/common/javax/swing/JOptionPane.java =================================================================== --- src/main/java/common/javax/swing/JOptionPane.java (revision 494382) +++ src/main/java/common/javax/swing/JOptionPane.java (working copy) @@ -487,7 +487,7 @@ } public Object[] getOptions() { - return (options != null) ? (Object[])options.clone() : new Object[0]; + return ((options != null) ? ((Object[]) options.clone()) : null); } public void setInitialValue(final Object newValue) {