Author: amilas
Date: Wed May 20 10:04:56 2009
New Revision: 776645
URL: http://svn.apache.org/viewvc?rev=776645&view=rev
Log:
applied the patch for SANDESHA2-191
Modified:
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java
webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-derby.ddl
webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-mysql.ddl
Modified:
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java?rev=776645&r1=776644&r2=776645&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java
(original)
+++
webservices/sandesha/trunk/java/modules/persistence/src/main/java/org/apache/sandesha2/storage/jdbc/PersistentRMSBeanMgr.java
Wed May 20 10:04:56 2009
@@ -139,6 +139,14 @@
sql.append(clause);
sql.append("'");
}
+ epr = bean.getOfferedEndPointEPR();
+ if (epr != null) {
+ sql.append(op);
+ op = " and ";
+ sql.append(" offered_endpoint_epr_addr='");
+ sql.append(epr.getAddress());
+ sql.append("'");
+ }
clause = bean.getOfferedSequence();
if (clause != null) {
sql.append(op);
@@ -163,6 +171,14 @@
sql.append(xrs.toString());
sql.append("'");
}
+ clause = bean.getInternalSeqIDOfSeqUsedForReallocation();
+ if (clause != null) {
+ sql.append(op);
+ op = " and ";
+ sql.append(" internalSeqIDOfSeqUsedForReallocation='");
+ sql.append(clause);
+ sql.append("'");
+ }
if ((bean.getRmsFlags() & RMSBean.LAST_SEND_ERROR_TIME_FLAG) !=
0) {
sql.append(op);
op = " and ";
@@ -276,6 +292,10 @@
if (obj != null) {
bean.setAcksToEndpointReference((EndpointReference)
obj);
}
+ obj = getObject(rs, "offered_endpoint_epr");
+ if (obj != null) {
+ bean.setOfferedEndPointEPR((EndpointReference) obj);
+ }
bean.setRMVersion(rs.getString("rm_version"));
bean.setServiceName(rs.getString("service_name"));
@@ -314,6 +334,8 @@
bean.setSoapVersion(rs.getInt("soap_version"));
bean.setFlags(rs.getInt("flags"));
bean.setRmsFlags(rs.getInt("rms_flags"));
+ bean.setReallocated(rs.getInt("reallocated"));
+
bean.setInternalSeqIDOfSeqUsedForReallocation(rs.getString("internalSeqIDOfSeqUsedForReallocation"));
return bean;
}
@@ -363,7 +385,8 @@
"anonymous_uuid,last_send_error_timestamp,last_out_message,highest_out_message_number,"
+
"next_message_number,terminate_added,timed_out,sequence_closed_client," +
"expected_replies,soap_version,termination_pauser_for_cs,avoid_auto_termination,"
+
-
"rms_flags)values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+
"rms_flags,offered_endpoint_epr_addr,offered_endpoint_epr,reallocated,internalSeqIDOfSeqUsedForReallocation)"
+
+
"values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
pstmt.setString(1, bean.getCreateSeqMsgID());
pstmt.setString(2, bean.getSequenceID());
EndpointReference epr = bean.getToEndpointReference();
@@ -413,6 +436,12 @@
pstmt.setInt(37, bean.isTerminationPauserForCS() ? 1 :
0);
pstmt.setInt(38, bean.isAvoidAutoTermination() ? 1 : 0);
pstmt.setInt(39, bean.getRmsFlags());
+ epr = bean.getOfferedEndPointEPR();
+ pstmt.setString(40, epr != null ? epr.getAddress() :
null);
+ bais = serialize(epr);
+ pstmt.setBinaryStream(41, bais, bais.available());
+ pstmt.setInt(42, bean.isReallocated());
+ pstmt.setString(43,
bean.getInternalSeqIDOfSeqUsedForReallocation());
pstmt.execute();
pstmt.close();
} catch (Exception ex) {
Modified:
webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-derby.ddl
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-derby.ddl?rev=776645&r1=776644&r2=776645&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-derby.ddl
(original)
+++
webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-derby.ddl
Wed May 20 10:04:56 2009
@@ -76,6 +76,8 @@
client_completed_messages clob,
transport_to varchar(255),
offered_endpoint varchar(255),
+ offered_endpoint_epr_addr varchar(255),
+ offered_endpoint_epr blob,
offered_sequence varchar(255),
anonymous_uuid varchar(255),
last_send_error_timestamp bigint,
@@ -90,6 +92,8 @@
termination_pauser_for_cs smallint,
avoid_auto_termination smallint,
rms_flags integer,
+ reallocated smallint,
+ internalSeqIDOfSeqUsedForReallocation varchar(255),
primary key (create_seq_msg_id)
);
Modified:
webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-mysql.ddl
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-mysql.ddl?rev=776645&r1=776644&r2=776645&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-mysql.ddl
(original)
+++
webservices/sandesha/trunk/java/modules/persistence/src/resources/ddl/sandesha2-mysql.ddl
Wed May 20 10:04:56 2009
@@ -76,6 +76,8 @@
client_completed_messages blob,
transport_to varchar(255),
offered_endpoint varchar(255),
+ offered_endpoint_epr_addr varchar(255),
+ offered_endpoint_epr blob,
offered_sequence varchar(255),
anonymous_uuid varchar(255),
last_send_error_timestamp bigint,
@@ -90,6 +92,8 @@
termination_pauser_for_cs smallint,
avoid_auto_termination smallint,
rms_flags integer,
+ reallocated smallint,
+ internalSeqIDOfSeqUsedForReallocation varchar(255),
primary key (create_seq_msg_id)
);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
