fixes an error in the construction of the presence document

src/net/java/sip/communicator/impl/protocol/sip/OperationSetPresenceSipImpl.java

@@ -569,7 +569,7 @@ public void publishPresenceStatus(PresenceStatus status,
                 transac = this.parentProvider
                     .getDefaultJainSipProvider().getNewClientTransaction(req);
             } catch (TransactionUnavailableException e) {
-                logger.debug("can't create the client transaction", e);
+                logger.error("can't create the client transaction", e);
                 throw new OperationFailedException(
                         "can't create the client transaction",
                         OperationFailedException.NETWORK_FAILURE);
@@ -578,7 +578,7 @@ public void publishPresenceStatus(PresenceStatus status,
             try {
                 transac.sendRequest();
             } catch (SipException e) {
-                logger.debug("can't send the PUBLISH request");
+                logger.error("can't send the PUBLISH request");
                 throw new OperationFailedException(
                         "can't send the PUBLISH request",
                         OperationFailedException.NETWORK_FAILURE);
@@ -618,14 +618,14 @@ public void publishPresenceStatus(PresenceStatus status,
                                         SubscriptionStateHeader.ACTIVE, null);
                         }
                     } catch (OperationFailedException e) {
-                        logger.debug("failed to create the new notify", e);
+                        logger.error("failed to create the new notify", e);
                         return;
                     }
 
                     try {
                         contact.getServerDialog().sendRequest(transac);
                     } catch (Exception e) {
-                        logger.debug("Can't send the request");
+                        logger.error("Can't send the request", e);
                         return;
                     }
                 }
@@ -963,7 +963,14 @@ public PresenceStatus queryContactStatus(String contactIdentifier)
                IllegalStateException,
                OperationFailedException
     {
-        return resolveContactID(contactIdentifier).getPresenceStatus();
+        Contact contact = resolveContactID(contactIdentifier);
+        
+        if (contact == null) {
+            throw new IllegalArgumentException("contact " + contactIdentifier
+                    + " unknown");
+        }
+        
+        return contact.getPresenceStatus();
     }
 
     /**
@@ -3315,10 +3322,12 @@ public byte[] getPidfPresenceStatus(ContactSipImpl contact)
          person.appendChild(activities);
          
          // the correct activity
-         if (getPresenceStatus().equals(SipStatusEnum.AWAY)) {
+         if (contact.getPresenceStatus().equals(SipStatusEnum.AWAY)) {
              Element away = doc.createElement(NS_AWAY_ELT);
              activities.appendChild(away);
-         } else if (getPresenceStatus().equals(SipStatusEnum.DO_NOT_DISTURB)) {
+         } else if (contact.getPresenceStatus()
+                 .equals(SipStatusEnum.DO_NOT_DISTURB))
+         {
              Element busy = doc.createElement(NS_BUSY_ELT);
              activities.appendChild(busy);
          }
@@ -3335,7 +3344,7 @@ public byte[] getPidfPresenceStatus(ContactSipImpl contact)
 
          // <basic>
          Element basic = doc.createElement(BASIC_ELEMENT);
-         if (this.getPresenceStatus().equals(SipStatusEnum.OFFLINE)) {
+         if (contact.getPresenceStatus().equals(SipStatusEnum.OFFLINE)) {
              basic.appendChild(doc.createTextNode(OFFLINE_STATUS));
          } else {
              basic.appendChild(doc.createTextNode(ONLINE_STATUS));
@@ -3352,7 +3361,7 @@ public byte[] getPidfPresenceStatus(ContactSipImpl contact)
          // used for automatic parsing but some (bad) IM clients do this...
          // we don't use xml:lang here because it's not really revelant
          Element noteNodeEl = doc.createElement(NOTE_ELEMENT);
-         noteNodeEl.appendChild(doc.createTextNode(this.getPresenceStatus()
+         noteNodeEl.appendChild(doc.createTextNode(contact.getPresenceStatus()
                  .getStatusName()));
          tuple.appendChild(noteNodeEl);
 

test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPresence.java

@@ -411,6 +411,8 @@ public void postTestSubscribe()
         if(oldStatus.equals(newStatus)){
             newStatus = getSampleStatus2();
         }
+        
+        logger.debug("trying to set status " + newStatus + " for contact 2");
 
         //now do the actual status notification testing
         ContactPresenceEventCollector contactPresEvtCollector