[Red5commits] [1625] RecordSet?, BaseRTMPHandler - cleaned up if stmtRTMPProtocolEncoder, RTMPHandle
pgregoire
luke at codegent.com
Wed Jan 24 11:09:19 EST 2007
RecordSet?, BaseRTMPHandler - cleaned up if stmt
RTMPProtocolEncoder, RTMPHandler - removed un-ness cast/obj creation
RTMPClient - exchanged string literal for char literal - optimized
AbstractIOTest - use valueOf instead of 'new' to reduce obj creation
ScriptEngineTest? - added jdk6 calls
Timestamp: 01/16/07 18:58:59 EST (1 week ago)
Change: 1625
Author: pgregoire
Files (see diff or trac for details):
java/server/trunk/.classpath
java/server/trunk/.project
java/server/trunk/.settings/org.eclipse.jdt.core.prefs
java/server/trunk/src/org/red5/io/object/RecordSet.java
java/server/trunk/src/org/red5/server/DebugPooledByteBufferAllocator.java
java/server/trunk/src/org/red5/server/api/stream/IBroadcastStream.java
java/server/trunk/src/org/red5/server/net/rtmp/BaseRTMPHandler.java
java/server/trunk/src/org/red5/server/net/rtmp/RTMPClient.java
java/server/trunk/src/org/red5/server/net/rtmp/RTMPHandler.java
java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolEncoder.java
java/server/trunk/src/org/red5/server/stream/ClientBroadcastStream.java
java/server/trunk/test/org/red5/server/io/test/AbstractIOTest.java
java/server/trunk/test/org/red5/server/script/ScriptEngineTest.java
Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1625
Index: /java/server/trunk/test/org/red5/server/script/ScriptEngineTest.java
===================================================================
--- /java/server/trunk/test/org/red5/server/script/ScriptEngineTest.java (revision 1526)
+++ /java/server/trunk/test/org/red5/server/script/ScriptEngineTest.java (revision 1625)
@@ -4,4 +4,5 @@
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@@ -247,5 +248,6 @@
Map<String, ScriptEngineFactory> engineFactories = new HashMap<String, ScriptEngineFactory>(
7);
- ScriptEngineFactory[] factories = mgr.getEngineFactories();
+ List<ScriptEngineFactory> factories = mgr.getEngineFactories(); //jdk6
+ //ScriptEngineFactory[] factories = mgr.getEngineFactories(); //jdk5
for (ScriptEngineFactory factory : factories) {
try {
@@ -259,10 +261,12 @@
engName, engVersion, langName, langVersion);
engineFactories.put(engName, factory);
- String[] engNames = factory.getNames();
+ List<String> engNames = factory.getNames();
+ //String[] engNames = factory.getNames(); //jdk5
System.out.print("\nEngine Alias(es):");
for (String name : engNames) {
System.out.printf("%s ", name);
}
- String[] ext = factory.getExtensions();
+ List<String> ext = factory.getExtensions();
+ //String[] ext = factory.getExtensions(); //jdk5
System.out.printf("\nExtension: ");
for (String name : ext) {
Index: /java/server/trunk/test/org/red5/server/io/test/AbstractIOTest.java
===================================================================
--- /java/server/trunk/test/org/red5/server/io/test/AbstractIOTest.java (revision 1606)
+++ /java/server/trunk/test/org/red5/server/io/test/AbstractIOTest.java (revision 1625)
@@ -89,5 +89,5 @@
log.debug("Testing number");
int num = 1000;
- serializer.serialize(out, new Integer(num));
+ serializer.serialize(out, Integer.valueOf(num));
dumpOutput();
Number n = (Number) deserializer.deserialize(in);
@@ -134,5 +134,5 @@
listIn.add(Boolean.FALSE);
listIn.add(Boolean.TRUE);
- listIn.add(new Integer(1));
+ listIn.add(Integer.valueOf(1));
listIn.add("This is a test string");
listIn.add(new Date());
@@ -156,5 +156,5 @@
beanIn.setTestBoolean((System.currentTimeMillis()%2==0) ? true : false);
beanIn.setTestBooleanObject((System.currentTimeMillis()%2==0) ? Boolean.TRUE : Boolean.FALSE );
- beanIn.setTestNumberObject(new Integer((int)System.currentTimeMillis()/1000));
+ beanIn.setTestNumberObject(Integer.valueOf((int)System.currentTimeMillis()/1000));
serializer.serialize(out,beanIn);
dumpOutput();
@@ -178,5 +178,5 @@
public void testMap(){
Map mapIn = new HashMap();
- mapIn.put("testNumber",new Integer(34));
+ mapIn.put("testNumber",Integer.valueOf(34));
mapIn.put("testString","wicked");
mapIn.put("testBean",new SimpleJavaBean());
Index: /java/server/trunk/.project
===================================================================
--- /java/server/trunk/.project (revision 221)
+++ /java/server/trunk/.project (revision 1625)
@@ -11,7 +11,13 @@
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>com.jutils.lint4j.core.Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.jutils.lint4j.core.Nature</nature>
</natures>
</projectDescription>
Index: /java/server/trunk/src/org/red5/server/DebugPooledByteBufferAllocator.java
===================================================================
--- /java/server/trunk/src/org/red5/server/DebugPooledByteBufferAllocator.java (revision 1590)
+++ /java/server/trunk/src/org/red5/server/DebugPooledByteBufferAllocator.java (revision 1625)
@@ -241,10 +241,5 @@
timeout = 0;
}
-
this.timeout = timeout;
-
- if (timeout > 0) {
-
- }
}
Index: /java/server/trunk/src/org/red5/server/stream/ClientBroadcastStream.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/ClientBroadcastStream.java (revision 1606)
+++ /java/server/trunk/src/org/red5/server/stream/ClientBroadcastStream.java (revision 1625)
@@ -318,5 +318,4 @@
rtmpEvent = (IRTMPEvent) event;
} catch (ClassCastException e) {
- e.printStackTrace();
log.error("Class cast exception in event dispatch", e);
return;
Index: /java/server/trunk/src/org/red5/server/net/rtmp/RTMPHandler.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/rtmp/RTMPHandler.java (revision 1603)
+++ /java/server/trunk/src/org/red5/server/net/rtmp/RTMPHandler.java (revision 1625)
@@ -208,5 +208,5 @@
call.setStatus(Call.STATUS_SERVICE_NOT_FOUND);
if (call instanceof IPendingServiceCall) {
- StatusObject status = (StatusObject) getStatus(NC_CONNECT_REJECTED);
+ StatusObject status = getStatus(NC_CONNECT_REJECTED);
status.setDescription("No scope \""+path+"\" on this server.");
((IPendingServiceCall) call).setResult(status);
@@ -223,5 +223,5 @@
call.setStatus(Call.STATUS_SERVICE_NOT_FOUND);
if (call instanceof IPendingServiceCall) {
- StatusObject status = (StatusObject) getStatus(NC_CONNECT_REJECTED);
+ StatusObject status = getStatus(NC_CONNECT_REJECTED);
status.setDescription("No scope \""+path+"\" on this server.");
((IPendingServiceCall) call).setResult(status);
@@ -277,5 +277,5 @@
call.setStatus(Call.STATUS_ACCESS_DENIED);
if (call instanceof IPendingServiceCall) {
- StatusObject status = (StatusObject) getStatus(NC_CONNECT_REJECTED);
+ StatusObject status = getStatus(NC_CONNECT_REJECTED);
status.setApplication(rejected
.getReason());
Index: /java/server/trunk/src/org/red5/server/net/rtmp/RTMPClient.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/rtmp/RTMPClient.java (revision 1606)
+++ /java/server/trunk/src/org/red5/server/net/rtmp/RTMPClient.java (revision 1625)
@@ -119,5 +119,5 @@
Map<String, Object> params = new HashMap<String, Object>();
params.put("app", application);
- params.put("tcUrl", "rtmp://"+server+":"+port+"/"+application);
+ params.put("tcUrl", "rtmp://"+server+':'+port+'/'+application);
connect(server, port, params, connectCallback);
}
Index: /java/server/trunk/src/org/red5/server/net/rtmp/BaseRTMPHandler.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/rtmp/BaseRTMPHandler.java (revision 1603)
+++ /java/server/trunk/src/org/red5/server/net/rtmp/BaseRTMPHandler.java (revision 1625)
@@ -249,19 +249,16 @@
Set<IPendingServiceCallback> callbacks = pendingCall
.getCallbacks();
- if (callbacks.isEmpty()) {
- return;
- }
-
- HashSet<IPendingServiceCallback> tmp = new HashSet<IPendingServiceCallback>();
- tmp.addAll(callbacks);
- for (IPendingServiceCallback callback : tmp) {
- try {
- callback.resultReceived(pendingCall);
- } catch (Exception e) {
- log.error("Error while executing callback " + callback, e);
- }
- }
+ if (!callbacks.isEmpty()) {
+ HashSet<IPendingServiceCallback> tmp = new HashSet<IPendingServiceCallback>();
+ tmp.addAll(callbacks);
+ for (IPendingServiceCallback callback : tmp) {
+ try {
+ callback.resultReceived(pendingCall);
+ } catch (Exception e) {
+ log.error("Error while executing callback " + callback, e);
+ }
+ }
+ }
}
- return;
}
Index: /java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolEncoder.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolEncoder.java (revision 1608)
+++ /java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolEncoder.java (revision 1625)
@@ -306,7 +306,5 @@
int mark, len;
- for (ISharedObjectEvent event1 : so.getEvents()) {
-
- ISharedObjectEvent event = (ISharedObjectEvent) event1;
+ for (ISharedObjectEvent event : so.getEvents()) {
byte type = SharedObjectTypeMapping.toByte(event.getType());
Index: /java/server/trunk/src/org/red5/server/api/stream/IBroadcastStream.java
===================================================================
--- /java/server/trunk/src/org/red5/server/api/stream/IBroadcastStream.java (revision 1595)
+++ /java/server/trunk/src/org/red5/server/api/stream/IBroadcastStream.java (revision 1625)
@@ -21,6 +21,4 @@
import org.red5.server.messaging.IProvider;
-
-import java.io.IOException;
/**
Index: /java/server/trunk/src/org/red5/io/object/RecordSet.java
===================================================================
--- /java/server/trunk/src/org/red5/io/object/RecordSet.java (revision 1608)
+++ /java/server/trunk/src/org/red5/io/object/RecordSet.java (revision 1625)
@@ -110,25 +110,22 @@
input.skipEndObject();
- Map<String, Object> serverInfo = (Map<String, Object>) dataMap.get("serverinfo");
- if (serverInfo == null) {
- // This is right according to the specs on osflash.org
- serverInfo = (Map<String, Object>) dataMap.get("serverInfo");
- }
-
- if (!(serverInfo instanceof Map)) {
- throw new RuntimeException("Expected Map but got " + serverInfo);
- }
-
- totalCount = (Integer) serverInfo.get("totalCount");
- List<List<Object>> initialData = (List<List<Object>>) serverInfo.get("initialData");
- cursor = (Integer) serverInfo.get("cursor");
- serviceName = (String) serverInfo.get("serviceName");
- columns = (List<String>) serverInfo.get("columnNames");
- version = (Integer) serverInfo.get("version");
- id = serverInfo.get("id");
-
- this.data = new ArrayList<List<Object>>(totalCount);
- for (int i = 0; i < initialData.size(); i++) {
- this.data.add(i + cursor - 1, initialData.get(i));
+ Object map = dataMap.get("serverinfo");
+ Map<String, Object> serverInfo = null;
+ if (map != null) {
+ serverInfo = (Map<String, Object>) map;
+ totalCount = (Integer) serverInfo.get("totalCount");
+ List<List<Object>> initialData = (List<List<Object>>) serverInfo.get("initialData");
+ cursor = (Integer) serverInfo.get("cursor");
+ serviceName = (String) serverInfo.get("serviceName");
+ columns = (List<String>) serverInfo.get("columnNames");
+ version = (Integer) serverInfo.get("version");
+ id = serverInfo.get("id");
+
+ this.data = new ArrayList<List<Object>>(totalCount);
+ for (int i = 0; i < initialData.size(); i++) {
+ this.data.add(i + cursor - 1, initialData.get(i));
+ }
+ } else if (!(map instanceof Map)) {
+ throw new RuntimeException("Expected Map but got " + map.getClass().getName());
}
}
Index: /java/server/trunk/.classpath
===================================================================
--- /java/server/trunk/.classpath (revision 1612)
+++ /java/server/trunk/.classpath (revision 1625)
@@ -17,5 +17,5 @@
<classpathentry excluding=".svn/*" kind="src" path="webapps/test/WEB-INF/src"/>
<classpathentry kind="lib" path="lib/quartz-1.5.2.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java6"/>
<classpathentry kind="lib" path="lib/xmlrpc-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
Index: /java/server/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /java/server/trunk/.settings/org.eclipse.jdt.core.prefs (revision 1400)
+++ /java/server/trunk/.settings/org.eclipse.jdt.core.prefs (revision 1625)
@@ -1,9 +1,9 @@
-#Mon Sep 25 08:37:21 PDT 2006
+#Tue Jan 16 10:27:03 PST 2007
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.
More information about the Red5commits
mailing list