Code Review
/
ric-plt
/
submgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Taking RMR v4.4.6 from release repo
[ric-plt/submgr.git]
/
pkg
/
control
/
transaction.go
diff --git
a/pkg/control/transaction.go
b/pkg/control/transaction.go
index
56dff1d
..
f722d11
100644
(file)
--- a/
pkg/control/transaction.go
+++ b/
pkg/control/transaction.go
@@
-52,7
+52,11
@@
type Transaction struct {
}
func (t *Transaction) String() string {
}
func (t *Transaction) String() string {
- return "trans(" + strconv.FormatUint(uint64(t.Seq), 10) + "/" + t.Meid.RanName + ")"
+ meidstr := "N/A"
+ if t.Meid != nil {
+ meidstr = t.Meid.String()
+ }
+ return "trans(" + strconv.FormatUint(uint64(t.Seq), 10) + "/" + meidstr + ")"
}
func (t *Transaction) SendEvent(event interface{}, waittime time.Duration) (bool, bool) {
}
func (t *Transaction) SendEvent(event interface{}, waittime time.Duration) (bool, bool) {
@@
-125,7
+129,7
@@
func (t *TransactionSubs) Release() {
//
//-----------------------------------------------------------------------------
type TransactionXappKey struct {
//
//-----------------------------------------------------------------------------
type TransactionXappKey struct {
- RmrEndpoint
+
xapp.
RmrEndpoint
Xid string // xapp xid in req
}
Xid string // xapp xid in req
}
@@
-150,7
+154,7
@@
func (t *TransactionXapp) String() string {
return "transxapp(" + t.Transaction.String() + "/" + transkey + "/" + strconv.FormatUint(uint64(t.SubId), 10) + ")"
}
return "transxapp(" + t.Transaction.String() + "/" + transkey + "/" + strconv.FormatUint(uint64(t.SubId), 10) + ")"
}
-func (t *TransactionXapp) GetEndpoint() *RmrEndpoint {
+func (t *TransactionXapp) GetEndpoint() *
xapp.
RmrEndpoint {
t.mutex.Lock()
defer t.mutex.Unlock()
if t.XappKey != nil {
t.mutex.Lock()
defer t.mutex.Unlock()
if t.XappKey != nil {