[Ubermq-commits] jms/src/com/ubermq/jms/client/msg AbstractStreamMessage.java,1.7,1.8 LocalMapMessag
Brought to you by:
jimmyp
Menu
▾
▴
[Ubermq-commits] jms/src/com/ubermq/jms/client/msg AbstractStreamMessage.java,1.7,1.8 LocalMapMessage.java,1.5,1.6 LocalObjectMessage.java,1.8,1.9 LocalStreamMessage.java,1.5,1.6 LocalTextMessage.java,1.7,1.8
Update of /cvsroot/ubermq/jms/src/com/ubermq/jms/client/msg In directory sc8-pr-cvs1:/tmp/cvs-serv28253/src/com/ubermq/jms/client/msg Modified Files: AbstractStreamMessage.java LocalMapMessage.java LocalObjectMessage.java LocalStreamMessage.java LocalTextMessage.java Log Message: myriad JMS compliance issues Index: AbstractStreamMessage.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/msg/AbstractStreamMessage.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AbstractStreamMessage.java 11 Oct 2002 17:44:30 -0000 1.7 --- AbstractStreamMessage.java 30 Jan 2003 14:42:18 -0000 1.8 *************** *** 1,11 **** package com.ubermq.jms.client.msg; import com.ubermq.jms.server.datagram.*; import java.io.*; import java.nio.*; ! ! import com.ubermq.Utility; ! import com.ubermq.jms.client.IAcknowledgeHandler; ! import com.ubermq.jms.client.impl.LocalMessage; /** --- 1,11 ---- package com.ubermq.jms.client.msg; + import com.ubermq.*; + import com.ubermq.jms.client.*; + import com.ubermq.jms.client.impl.*; import com.ubermq.jms.server.datagram.*; import java.io.*; import java.nio.*; ! import javax.jms.*; /** *************** *** 57,60 **** --- 57,63 ---- public void writeInt(int param) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 84,87 **** --- 87,93 ---- public void writeObject(Object obj) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 94,97 **** --- 100,106 ---- public float readFloat() throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 103,106 **** --- 112,118 ---- public void writeFloat(float param) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 112,115 **** --- 124,130 ---- public void writeBoolean(boolean param) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 140,143 **** --- 155,161 ---- public void writeBytes(byte[] values, int param, int param2) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 149,152 **** --- 167,173 ---- public void writeDouble(double param) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 194,197 **** --- 215,221 ---- public void writeUTF(String str) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 203,206 **** --- 227,233 ---- public void writeBytes(byte[] values) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 212,215 **** --- 239,245 ---- public void writeShort(short param) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 239,242 **** --- 269,275 ---- public void writeByte(byte param) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 257,260 **** --- 290,296 ---- public void writeLong(long param) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { *************** *** 284,287 **** --- 320,326 ---- public void writeChar(char param) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + try { Index: LocalMapMessage.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/msg/LocalMapMessage.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LocalMapMessage.java 17 Dec 2002 14:52:24 -0000 1.5 --- LocalMapMessage.java 30 Jan 2003 14:42:18 -0000 1.6 *************** *** 1,9 **** package com.ubermq.jms.client.msg; import com.ubermq.jms.server.datagram.*; import java.util.*; ! ! import com.ubermq.jms.client.IAcknowledgeHandler; ! import com.ubermq.jms.client.impl.LocalMessage; /** --- 1,9 ---- package com.ubermq.jms.client.msg; + import com.ubermq.jms.client.*; + import com.ubermq.jms.client.impl.*; import com.ubermq.jms.server.datagram.*; import java.util.*; ! import javax.jms.*; /** *************** *** 29,44 **** --- 29,48 ---- public void setChar(String str, char param) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, new Character(param)); } public void setLong(String str, long param) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, new Long(param)); } public void setDouble(String str, double param) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, new Double(param)); } public void setByte(String str, byte param) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, new Byte(param)); } *************** *** 87,91 **** try { Vector v = new Vector(); ! map.keySet().addAll(v); return v.elements(); } catch(Exception cce) { --- 91,95 ---- try { Vector v = new Vector(); ! v.addAll(map.keySet()); return v.elements(); } catch(Exception cce) { *************** *** 95,102 **** --- 99,108 ---- public void setObject(String str, Object obj) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, obj); } public void setBoolean(String str, boolean param) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, new Boolean(param)); } *************** *** 115,134 **** --- 121,146 ---- public void setInt(String str, int param) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, new Integer(param)); } public void setBytes(String str, byte[] values) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, values); } public void setShort(String str, short param) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, new Short(param)); } public void setFloat(String str, float param) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, new Float(param)); } public void setBytes(String str, byte[] values, int param, int param3) throws javax.jms.JMSException { + checkSetOperation(str); + try { byte[] a = new byte[param3]; *************** *** 184,188 **** --- 196,211 ---- public void setString(String str, String str1) throws javax.jms.JMSException { + checkSetOperation(str); map.put(str, str1); + } + + private void checkSetOperation(String str) + throws IllegalArgumentException, MessageNotWriteableException + { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + if (str == null || + str.length() == 0) + throw new IllegalArgumentException("invalid key"); } Index: LocalObjectMessage.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/msg/LocalObjectMessage.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** LocalObjectMessage.java 25 Jan 2003 02:43:03 -0000 1.8 --- LocalObjectMessage.java 30 Jan 2003 14:42:19 -0000 1.9 *************** *** 1,7 **** package com.ubermq.jms.client.msg; import com.ubermq.jms.server.datagram.*; ! ! import com.ubermq.jms.client.IAcknowledgeHandler; ! import com.ubermq.jms.client.impl.LocalMessage; /** --- 1,7 ---- package com.ubermq.jms.client.msg; + import com.ubermq.jms.client.*; + import com.ubermq.jms.client.impl.*; import com.ubermq.jms.server.datagram.*; ! import javax.jms.*; /** *************** *** 39,43 **** --- 39,47 ---- public void setObject(java.io.Serializable serializable) + throws JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + this.theObject = serializable; } Index: LocalStreamMessage.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/msg/LocalStreamMessage.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LocalStreamMessage.java 17 Dec 2002 14:52:24 -0000 1.5 --- LocalStreamMessage.java 30 Jan 2003 14:42:19 -0000 1.6 *************** *** 1,8 **** package com.ubermq.jms.client.msg; import com.ubermq.jms.server.datagram.*; ! ! import com.ubermq.jms.client.IAcknowledgeHandler; ! import java.io.ObjectInputStream; /** --- 1,8 ---- package com.ubermq.jms.client.msg; + import com.ubermq.jms.client.*; import com.ubermq.jms.server.datagram.*; ! import java.io.*; ! import javax.jms.*; /** *************** *** 33,36 **** --- 33,39 ---- public void writeString(String str) throws javax.jms.JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + this.writeUTF(str); } Index: LocalTextMessage.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/msg/LocalTextMessage.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** LocalTextMessage.java 25 Jan 2003 02:43:04 -0000 1.7 --- LocalTextMessage.java 30 Jan 2003 14:42:19 -0000 1.8 *************** *** 1,7 **** package com.ubermq.jms.client.msg; import com.ubermq.jms.server.datagram.*; ! import com.ubermq.jms.client.IAcknowledgeHandler; ! import com.ubermq.jms.client.impl.LocalMessage; /** --- 1,8 ---- package com.ubermq.jms.client.msg; + import com.ubermq.jms.client.*; + import com.ubermq.jms.client.impl.*; import com.ubermq.jms.server.datagram.*; ! import javax.jms.*; /** *************** *** 23,27 **** --- 24,32 ---- public void setText(String sz) + throws JMSException { + if (!isWriteable()) + throw new MessageNotWriteableException("not writeable"); + super.setBody(sz); } |