Skip to content
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

Jump to bottom

Update to r12 #3

Merged
merged 2 commits into from Dec 17, 2015
Merged

Update to r12 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4b172a
Added missing R9 AVPs
Dec 10, 2015
f0c6cd8
update branch with version 9.6.0 To version 12.8.0
Dec 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...on/events/src/main/java/net/java/slee/resource/diameter/base/events/avp/AvpUtilities.java
View file
Open in desktop
Expand Up @@ -1449,7 +1449,7 @@ public static AvpSet setAvpAsGrouped(Object parent, int avpCode, AvpSet set, Dia
* @param avpCode the code of the AVP
* @param vendorId the Vendor-Id of the AVP
* @param set the Vendor-Id of the AVP
* @param value the value of the AVP to add
* @param childs the value of the AVP to add
*/
public static AvpSet setAvpAsGrouped(Object parent, int avpCode, long vendorId, AvpSet set, DiameterAvp[] childs) {
AvpRepresentation rep = AvpDictionary.INSTANCE.getAvp(avpCode, vendorId);
Expand All @@ -1471,7 +1471,7 @@ public static AvpSet setAvpAsGrouped(Object parent, int avpCode, long vendorId,
* @param set the AvpSet to add AVP
* @param isMandatory the value for the mandatory bit
* @param isProtected the value for the protected bit
* @param value the value of the AVP to add
* @param childs the value of the AVP to add
*/
public static AvpSet setAvpAsGrouped(Object parent, int avpCode, long vendorId, AvpSet set, boolean isMandatory, boolean isProtected, DiameterAvp[] childs) {
performPreAddOperations(parent, avpCode, vendorId, set);
Expand Down Expand Up @@ -2511,4 +2511,4 @@ private static DiameterAvp createAvpInternal(long vendorID, int avpCode, byte[]
return createAvp(avpCode, vendorID, value, null, DiameterAvpImpl.class);
}

}
}
4 changes: 2 additions & 2 deletions ...a/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterMessageFactoryImpl.java
View file
Open in desktop
Expand Up @@ -473,8 +473,8 @@ protected Message createMessage(DiameterHeader header, DiameterAvp[] avps,int _c
protected Message createRawMessage(DiameterHeader header, int _commandCode, ApplicationId appId) {

int commandCode = 0;
long endToEndId = 0;
long hopByHopId = 0;
long endToEndId = -1;
long hopByHopId = -1;

boolean isRequest = true;
boolean isProxiable = true;
Expand Down
6 changes: 3 additions & 3 deletions resources/diameter-base/pom.xml
View file
Open in desktop
Expand Up @@ -26,9 +26,9 @@

<properties>
<!-- Mobicents Diameter Components Versions -->
<mobicents.diameter.jdiameter.version>1.6.0.FINAL</mobicents.diameter.jdiameter.version>
<mobicents.diameter.mux.version>1.6.0.FINAL</mobicents.diameter.mux.version>
<mobicents.slee.version>2.7.0.FINAL</mobicents.slee.version>
<mobicents.diameter.jdiameter.version>1.7.0-SNAPSHOT</mobicents.diameter.jdiameter.version>
<mobicents.diameter.mux.version>1.7.0-SNAPSHOT</mobicents.diameter.mux.version>
<mobicents.slee.version>2.8.0-SNAPSHOT</mobicents.slee.version>
<!-- Documentation Related Properties -->
<docs.profile>mobicents</docs.profile>
<docs.ra.name>Diameter Base</docs.ra.name>
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/test/java/org/mobicents/slee/resource/diameter/base/tests/avp/AvpUtilitiesTest.java
View file
Open in desktop
Expand Up @@ -683,4 +683,4 @@ public boolean equals(Object obj) {
return false;
return true;
}
}
}
3 changes: 1 addition & 2 deletions ...est/java/org/mobicents/slee/resource/diameter/base/tests/factories/BaseFactoriesTest.java
View file
Open in desktop
Expand Up @@ -629,8 +629,7 @@ public void testAvpFactoryCreateExperimentalResult() {
Assert.assertNotNull("Created Experimental-Result AVP from objects should not be null.", erAvp1);

ExperimentalResultAvp erAvp2 = avpFactory.createExperimentalResult(erAvp1.getExtensionAvps());

Assert.assertEquals("Created Experimental-Result AVP from extension avps should be equal to original.", erAvp1, erAvp2);
Assert.assertEquals("Created Experimental-Result AVP from extension avps should be equal to original.", erAvp1, erAvp2);

ExperimentalResultAvp erAvp3 = avpFactory.createExperimentalResult(erAvp2.getVendorIdAVP(), erAvp2.getExperimentalResultCode());

Expand Down