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

Issue #2899 - Improve error messages.

Browse source 
Change-Id: Iba298e66d1b889fce8cde9103674c86558bd222c

Former-commit-id: d6ce901a3a [formerly dc81b79eca [formerly bcdfd5a0c9] [formerly d6ce901a3a [formerly e83da0adee12900da03cb4b273a90d13fc5fc327]]]
Former-commit-id: dc81b79eca [formerly bcdfd5a0c9]
Former-commit-id: dc81b79eca
Former-commit-id: b1aae9256c
This commit is contained in:
Mike Duff 2014-03-31 14:59:47 -05:00
parent 5eb3a137a3
commit f6fd3e0367
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
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 07, 2014 2848 bclement moved pubsub close logic to closePubSub()
* ensure that subscription is setup before joining room
* Mar 31, 2014 2899 mpduff Improve error messages.
*
* </pre>
*
@ -186,7 +187,7 @@ public class SharedDisplaySession extends VenueSession implements
* #sendObjectToVenue(java.lang.Object)
*/
@Override
public void sendObjectToVenue(Object obj){
public void sendObjectToVenue(Object obj) {
if (obj == null) {
return;
}
@ -300,15 +301,20 @@ public class SharedDisplaySession extends VenueSession implements
* configureVenue(java.lang.String)
*/
@Override
public void configureVenue()
throws CollaborationException {
public void configureVenue() throws CollaborationException {
try {
configureSubscription();
} catch (XMPPException e) {
closePubSub();
throw new CollaborationException(
"Unable to configure subscription", e);
int errorCode = e.getXMPPError().getCode();
String errorMsg = "Error configuring subscription";
if (errorCode == 404) {
errorMsg = "Shared display session no longer exists.";
}
throw new CollaborationException(errorMsg, e);
}
try {
super.configureVenue();
} catch (CollaborationException e) {
@ -675,7 +681,7 @@ public class SharedDisplaySession extends VenueSession implements
}
}
if (topicOwnershipGranted) {
try{
try {
revokeTopicOwnership(newLeaderId);
} catch (XMPPException e1) {
log.error(
@ -689,7 +695,7 @@ public class SharedDisplaySession extends VenueSession implements
log.warn("Problem releasing ownership of " + revokeTarget
+ ". " + e.getLocalizedMessage());
}
}
}
}
/*