Skip to content

Fix for broken RoundRobin? #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ovoo-unif wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for broken RoundRobin? #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/domain/src/main/java/org/mobicents/smsc/domain/DatabaseSmsRoutingRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public String getEsmeClusterName(int ton, int npi, String address, String name,
if (smscPropertiesManagement != null) {
String dcn = smscPropertiesManagement.getEsmeDefaultClusterName();
if (dcn != null) {
if (esmeManagement.getEsmeByClusterName(dcn) != null) {
if (esmeManagement.getEsmeByClusterName(dcn, true) != null) {
clusterName = dcn;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...bb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ protected EsmeManagementProxy2() {
}

@Override
public Esme getEsmeByClusterName(String esmeClusterName) {
public Esme getEsmeByClusterName(String esmeClusterName, final boolean anIndexUpdate) {
return esme;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ private void sendDeliverSm(SmsSet smsSet) throws SmscProcessingException {
}

EsmeManagement esmeManagement = EsmeManagement.getInstance();
Esme esme = esmeManagement.getEsmeByClusterName(smsSet.getDestClusterName());
Esme esme = esmeManagement.getEsmeByClusterName(smsSet.getDestClusterName(), true);
if (esme == null) {
String s = "\nRxSmppServerSbb.sendDeliverSm(): Received DELIVER_SM SmsEvent but no Esme found for destClusterName: "
+ smsSet.getDestClusterName() + ", smsSet=" + smsSet;
Expand Down Expand Up @@ -953,7 +953,7 @@ private void handleResponse(BaseSmResp event) throws Exception {
smscStatAggregator.updateMsgOutSentSmpp();

EsmeManagement esmeManagement = EsmeManagement.getInstance();
Esme esme = esmeManagement.getEsmeByClusterName(smsSet.getDestClusterName());
Esme esme = esmeManagement.getEsmeByClusterName(smsSet.getDestClusterName(), false);
boolean destAddressLimitationEnabled = esme.getDestAddrSendLimit() != 0;

int realID=-1;
Expand Down