xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2899 - Improve error messages." into development

Browse source 
Former-commit-id: b9aae5b0f2 [formerly f24a44ac9db6d1f1339aeaf3f0071656847b0d36]
Former-commit-id: fe56feaa74
This commit is contained in:
Nate Jensen 2014-04-01 08:46:25 -05:00 • committed by Gerrit Code Review
commit 651b40e423
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/SharedDisplaySession.java
View file

@ -91,6 +91,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.VenueParticipant;
* Mar 06, 2014 2751 bclement added calls to getParticipantUserid() * Mar 06, 2014 2751 bclement added calls to getParticipantUserid()
* Mar 07, 2014 2848 bclement moved pubsub close logic to closePubSub() * Mar 07, 2014 2848 bclement moved pubsub close logic to closePubSub()
* ensure that subscription is setup before joining room * ensure that subscription is setup before joining room
* Mar 31, 2014 2899 mpduff Improve error messages.
* *
* </pre> * </pre>
* *
@ -300,15 +301,20 @@ public class SharedDisplaySession extends VenueSession implements
* configureVenue(java.lang.String) * configureVenue(java.lang.String)
*/ */
@Override @Override
public void configureVenue() public void configureVenue() throws CollaborationException {
throws CollaborationException {
try { try {
configureSubscription(); configureSubscription();
} catch (XMPPException e) { } catch (XMPPException e) {
closePubSub(); closePubSub();
throw new CollaborationException( int errorCode = e.getXMPPError().getCode();
"Unable to configure subscription", e); String errorMsg = "Error configuring subscription";
if (errorCode == 404) {
errorMsg = "Shared display session no longer exists.";
} }
throw new CollaborationException(errorMsg, e);
}
try { try {
super.configureVenue(); super.configureVenue();
} catch (CollaborationException e) { } catch (CollaborationException e) {