Skip to content

Commit

Permalink
Merge pull request #10 from red5pro/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
bustardcelly authored May 1, 2018
2 parents a6ca1cf + 7342db1 commit 07cf76a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.infrared5.rtmpbee</groupId>
<artifactId>rtmpbee</artifactId>
<version>3.1.0-RELEASE</version>
<version>4.0.0-RELEASE</version>
<packaging>jar</packaging>
<name>rtmpbee</name>
<url>http://infrared5.com</url>
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/com/infrared5/rtmpbee/Red5Bee.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ public Red5Bee(String streamManagerURL, int numBullets, int timeout) throws Exce
this.streamManagerURL = streamManagerURL;
this.numBullets = numBullets;
this.timeout = timeout;
modifyEndpointProperties(this.streamManagerURL);
}

/**
Expand Down Expand Up @@ -146,10 +145,16 @@ private void loadMachineGun() {
// load our bullets into the gun
for (int i = 0; i < numBullets; i++) {
// build a bullet
Bullet bullet = Bullet.Builder.build((i + 1), url, port, application, streamName, timeout);
bullet.setCompleteHandler(this);
bullet.setFailHandler(this);
machineGun.put(i, bullet);
try {
modifyEndpointProperties(this.streamManagerURL);
Bullet bullet = Bullet.Builder.build((i + 1), url, port, application, streamName, timeout);
bullet.setCompleteHandler(this);
bullet.setFailHandler(this);
machineGun.put(i, bullet);
}
catch (Exception e) {
System.out.printf("[WARNING] Could not assemble bullet for firing: %s\n", e.getMessage());
}
}
}

Expand Down Expand Up @@ -278,7 +283,7 @@ else if (args.length < 5) {
return;
}
else {
System.out.println("Determined its an original attack...");
System.out.println("Determined its an original attack...\n");
url = args[0];
port = Integer.parseInt(args[1]);
application = args[2];
Expand Down

0 comments on commit 07cf76a

Please sign in to comment.