Verified Commit 9e21922b authored by Jonathan Haas's avatar Jonathan Haas
Browse files

Findbugs-Fehler korrigiert

parent 1940b949

config/findbugs/findbugs-exclude.xml

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<FindBugsFilter>



	<Match><Bug pattern="MS_MUTABLE_ARRAY"/></Match>

	<Match><Bug pattern="MS_SHOULD_BE_FINAL"/></Match>



	<!-- Tests -->

src/integrationtest/java/de/bsvrz/ars/ars/ArchiveTest.java

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public abstract class ArchiveTest { 
	/** Für die Methoden {@link #waitTillDone()} und {@link #iAmDone()} */

	private boolean iAmDone = false;



	protected String[] objs = ArchiveTestApplication.testObjectPids;

	protected String[] objs = ArchiveTestApplication.getTestObjectPids();



	/**

	 * @param time Anmeldezeit Quelle

src/integrationtest/java/de/bsvrz/ars/ars/bugreports/TestSubscriptionDelay.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class TestSubscriptionDelay { 
		_archiveApplication.archSettings(getStdSettings());

		_archiveApplication.archContSettings(200, TEN_MB, ONE_DAY);



		_archiveApplication.archParam(new ArSRemoteControl.ParamSatz(E, new ArSRemoteControl.Datenspez(Arrays.copyOf(_archiveApplication.testObjectPids, 100), TEST_ATG, TEST_ASP), new ArSRemoteControl.Einst(true, null, true, null, 2)));

		_archiveApplication.archParam(new ArSRemoteControl.ParamSatz(E, new ArSRemoteControl.Datenspez(Arrays.copyOf(getTestObjectPids(), 100), TEST_ATG, TEST_ASP), new ArSRemoteControl.Einst(true, null, true, null, 2)));



		long current = System.nanoTime();

		_archiveApplication.startAndWaitUntilReady(); // Auf Fertigmeldung warten

src/integrationtest/java/de/bsvrz/ars/ars/testenvironment/ArchiveTestApplication.java

+5 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class ArchiveTestApplication extends DafApplication<ArchiveManager> { 


	public static final String[] E = new String[0];



	public static final String[] testObjectPids = new String[NUM_TESTMQ];

	private static final String[] testObjectPids = new String[NUM_TESTMQ];



	static {

		for(int i = 0; i < testObjectPids.length; i++) {
@@ -243,6 +243,10 @@ public class ArchiveTestApplication extends DafApplication<ArchiveManager> { 
		}

	}



	public static String[] getTestObjectPids() {

		return testObjectPids.clone();

	}



	/**

	 * @param time Anmeldezeit Quelle

	 *

src/main/java/de/bsvrz/ars/ars/mgmt/tasks/ArchiveDataSerializer.java

+3 −12
Original line number Diff line number Diff line
@@ -52,12 +52,6 @@ import static de.bsvrz.ars.ars.persistence.ContainerFile.*; 
 */

public class ArchiveDataSerializer {



	/** Gibt an, ob gerade ein Performance-Test mit Dummy-Daten (um den Overhead durch Deserialisieren/Serialisieren zu vermeiden) läuft. */

	public static boolean IS_PERFORMANCE_TEST = false;



	/** Dummy-Daten für den Performance-Test. */

	public static byte[] PERF_TESTDATA = null;



	/**

	 * Referenz auf den tatsaechlichen, von {@link #serializeData(ResultData, long, Deflater)} verwendeten Puffer, der von {@link #writeBuf}

	 * abweicht, falls dieser zu klein ist). Notwendig, da Daten vorserialisiert werden müssen, um deren Länge zu bestimmen.
@@ -100,10 +94,7 @@ public class ArchiveDataSerializer { 
		createWriteBuffers();    // Puffer (nur für schreibende Tasks) lazy anlegen



		byte[] data;

		if(IS_PERFORMANCE_TEST) {

			data = PERF_TESTDATA;

		}

		else if(rd.hasData()) {

		if(rd.hasData()) {

			// normaler Datensatz

			bos.reset();

			try {
@@ -130,7 +121,7 @@ public class ArchiveDataSerializer { 
	 * @param desiredSize   Gewuenschte PufferGröße

	 * @return Byte-Array-Puffer

	 */

	public static byte[] getBuf(byte[] defaultBuffer, int desiredSize) {

	private static byte[] getBuf(byte[] defaultBuffer, int desiredSize) {

		return (desiredSize <= defaultBuffer.length) ? defaultBuffer : new byte[desiredSize];

	}
@@ -156,7 +147,7 @@ public class ArchiveDataSerializer { 
			return NO_RIGHTS;

		}

		else {

			return null;

			throw new IllegalArgumentException("Unbekannter Zustand: " + rd.getDataState());

		}

	}