Author: al Date: Sat Jun 8 11:06:24 2013 New Revision: 1490954 URL: http://svn.apache.org/r1490954 Log: Silence the welcome_wave_id warning on load.
By Bruno Gonzalez. https://reviews.apache.org/r/11676/ Modified: incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java incubator/wave/trunk/src/org/waveprotocol/box/server/robots/agent/welcome/WelcomeRobot.java Modified: incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java URL: http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java?rev=1490954&r1=1490953&r2=1490954&view=diff ============================================================================== --- incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java (original) +++ incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java Sat Jun 8 11:06:24 2013 @@ -182,7 +182,7 @@ public class CoreSettings { private static String adminUser; @Setting(name = WELCOME_WAVE_ID, description = "The welcome wave id.", - defaultValue = "UNDEFINED") + defaultValue = "") private static String welcomeWaveId; @Setting(name = LISTENER_EXECUTOR_THREAD_COUNT, Modified: incubator/wave/trunk/src/org/waveprotocol/box/server/robots/agent/welcome/WelcomeRobot.java URL: http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/server/robots/agent/welcome/WelcomeRobot.java?rev=1490954&r1=1490953&r2=1490954&view=diff ============================================================================== --- incubator/wave/trunk/src/org/waveprotocol/box/server/robots/agent/welcome/WelcomeRobot.java (original) +++ incubator/wave/trunk/src/org/waveprotocol/box/server/robots/agent/welcome/WelcomeRobot.java Sat Jun 8 11:06:24 2013 @@ -67,7 +67,7 @@ public class WelcomeRobot extends Abstra super(injector); String welcomeWaveIdStr = injector.getInstance(Key.get(String.class, Names.named(CoreSettings.WELCOME_WAVE_ID))); - if (!"UNDEFINED".equals(welcomeWaveIdStr)) { + if (!"".equals(welcomeWaveIdStr)) { try { welcomeWaveId = WaveId.ofChecked(getWaveDomain(), welcomeWaveIdStr); } catch (InvalidIdException e) {
