[Openbus-cvs-commits] Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging DeliveryChannelImpl.java,1.13,1.14 NormalizedMessageImpl.java,1.4,1.5

[Diego E. <er...@us...>]

Update of /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21221/src/java/org/openbus/jbi/messaging

Modified Files:
	DeliveryChannelImpl.java NormalizedMessageImpl.java 
Log Message:
fixed problems with the reference implementation interfaces 

Index: DeliveryChannelImpl.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging/DeliveryChannelImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DeliveryChannelImpl.java	28 Jun 2005 22:54:44 -0000	1.13
--- DeliveryChannelImpl.java	19 Jul 2005 03:07:14 -0000	1.14
***************
*** 266,272 ****
  	 * @see javax.jbi.messaging.DeliveryChannel#sendSynch(javax.jbi.messaging.MessageExchange)
  	 */
! 	public boolean sendSynch(MessageExchange exchange)
  			throws MessagingException {
! 		return sendSynch(exchange, Long.MAX_VALUE);
  	}
  
--- 266,272 ----
  	 * @see javax.jbi.messaging.DeliveryChannel#sendSynch(javax.jbi.messaging.MessageExchange)
  	 */
! 	public boolean sendSync(MessageExchange exchange)
  			throws MessagingException {
! 		return sendSync(exchange, Long.MAX_VALUE);
  	}
  
***************
*** 277,281 ****
  	 *      long)
  	 */
! 	public boolean sendSynch(MessageExchange exchange, long timeoutMS)
  			throws MessagingException {
  		if (isClosed) {
--- 277,281 ----
  	 *      long)
  	 */
! 	public boolean sendSync(MessageExchange exchange, long timeoutMS)
  			throws MessagingException {
  		if (isClosed) {

Index: NormalizedMessageImpl.java
===================================================================
RCS file: /cvsroot/openbus/Openbus/OpenbusJBI/src/java/org/openbus/jbi/messaging/NormalizedMessageImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NormalizedMessageImpl.java	8 Jun 2005 04:32:38 -0000	1.4
--- NormalizedMessageImpl.java	19 Jul 2005 03:07:14 -0000	1.5
***************
*** 5,9 ****
  import java.io.Serializable;
  import java.util.HashMap;
- import java.util.Iterator;
  import java.util.Map;
  import java.util.Set;
--- 5,8 ----
***************
*** 89,95 ****
  	 * @see javax.jbi.messaging.NormalizedMessage#getPropertyNames()
  	 */
! 	public Iterator getPropertyNames() {
  		// TODO check if a Collections.unmodifiableCollection is needed
! 		return propertiesByName.keySet().iterator();
  	}
  
--- 88,94 ----
  	 * @see javax.jbi.messaging.NormalizedMessage#getPropertyNames()
  	 */
! 	public Set getPropertyNames() {
  		// TODO check if a Collections.unmodifiableCollection is needed
! 		return propertiesByName.keySet();
  	}
  
***************
*** 99,103 ****
  	 * @see javax.jbi.messaging.NormalizedMessage#getSecurityObject()
  	 */
! 	public Subject getSecurityObject() {
  		return securityObject;
  	}
--- 98,102 ----
  	 * @see javax.jbi.messaging.NormalizedMessage#getSecurityObject()
  	 */
! 	public Subject getSecuritySubject() {
  		return securityObject;
  	}
***************
*** 106,119 ****
  	 * (non-Javadoc)
  	 * 
- 	 * @see javax.jbi.messaging.NormalizedMessage#listAttachments()
- 	 */
- 	public Iterator listAttachments() {
- 		// TODO check if a Collections.unmodifiableCollection is needed
- 		return attachmentsById.values().iterator();
- 	}
- 
- 	/*
- 	 * (non-Javadoc)
- 	 * 
  	 * @see javax.jbi.messaging.NormalizedMessage#removeAttachment(java.lang.String)
  	 */
--- 105,108 ----
***************
*** 147,151 ****
  	 * @see javax.jbi.messaging.NormalizedMessage#setSecurityObject(javax.security.auth.Subject)
  	 */
! 	public void setSecurityObject(Subject subject) {
  		this.securityObject = subject;
  	}
--- 136,140 ----
  	 * @see javax.jbi.messaging.NormalizedMessage#setSecurityObject(javax.security.auth.Subject)
  	 */
! 	public void setSecuritySubject(Subject subject) {
  		this.securityObject = subject;
  	}