User: pra
Date: 01/08/23 11:17:18
Modified: src/main/org/jboss/metadata MessageDrivenMetaData.java
Log:
Fixed the message-driven-destination is optional bug; this spec compliance means
that some guessing have to be done. If its missing jboss.xml will be used to deduce
the message destination type, if jboss.xml or destinationJNDI in it is missing it will
default to Topic, which means the dreaded auto creation of destinations will then be
Topics
Revision Changes Path
1.13 +20 -17 jboss/src/main/org/jboss/metadata/MessageDrivenMetaData.java
Index: MessageDrivenMetaData.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/metadata/MessageDrivenMetaData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MessageDrivenMetaData.java 2001/08/23 09:57:50 1.12
+++ MessageDrivenMetaData.java 2001/08/23 18:17:18 1.13
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>.
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class MessageDrivenMetaData
extends BeanMetaData
@@ -37,7 +37,7 @@
// Attributes ----------------------------------------------------
private int acknowledgeMode = AUTO_ACKNOWLEDGE_MODE;
- private String destinationType;
+ private String destinationType = null;
private byte subscriptionDurability = NON_DURABLE_SUBSCRIPTION;
private String messageSelector; // = null;
private String destinationJndiName;
@@ -164,23 +164,26 @@
messageSelector = getOptionalChildContent(element, "message-selector");
+ // destination is optional
Element destination =
- getUniqueChild(element, "message-driven-destination");
- destinationType = getUniqueChildContent(destination, "destination-type");
-
- if (destinationType.equals("javax.jms.Topic")) {
- String subscr =
- getUniqueChildContent(destination, "subscription-durability");
-
- // Should we do sanity check??
- if (subscr.equals("Durable")) {
- subscriptionDurability = DURABLE_SUBSCRIPTION;
- }
- else {
- subscriptionDurability = NON_DURABLE_SUBSCRIPTION;//Default
- }
+ getOptionalChild(element, "message-driven-destination");
+ if (destination != null) {
+ destinationType = getUniqueChildContent(destination,
+ "destination-type");
+
+ if (destinationType.equals("javax.jms.Topic")) {
+ String subscr =
+ getUniqueChildContent(destination, "subscription-durability");
+
+ // Should we do sanity check??
+ if (subscr.equals("Durable")) {
+ subscriptionDurability = DURABLE_SUBSCRIPTION;
+ }
+ else {
+ subscriptionDurability = NON_DURABLE_SUBSCRIPTION;//Default
+ }
+ }
}
-
// set the transaction type
String transactionType =
getUniqueChildContent(element, "transaction-type");
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
