inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
125817 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125673 abalmus: MNT-15421 : Intermittent failure SubsystemsTest.testAbstractPropertyBackedBean_performEarlyPropertyChecks_PortEarlyPropertyChecker
         - Fixed intermittently failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125859 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andreea Dragoi
2016-04-27 12:22:40 +00:00
parent 30a63154fb
commit 4278099cea
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/management/subsystems/PortEarlyPropertyChecker.java
View File

@@ -116,7 +116,7 @@ public class PortEarlyPropertyChecker implements SubsystemEarlyPropertyChecker
{ {
try try
{ {
PortUtil.checkPort(portNumber, host); checkPort(portNumber, host);
} }
catch (IOException ioe) catch (IOException ioe)
{ {
@@ -164,7 +164,7 @@ public class PortEarlyPropertyChecker implements SubsystemEarlyPropertyChecker
{ {
try try
{ {
PortUtil.checkPort(portNumber, host); checkPort(portNumber, host);
} }
catch (IOException ioe) catch (IOException ioe)
{ {
@@ -223,6 +223,11 @@ public class PortEarlyPropertyChecker implements SubsystemEarlyPropertyChecker
} }
} }
protected void checkPort(int portNumber, String host) throws IOException
{
PortUtil.checkPort(portNumber, host);
}
private String appendToErrorString(String stringToAppendTo, String separator, String valueToAppend) private String appendToErrorString(String stringToAppendTo, String separator, String valueToAppend)
{ {
if (!stringToAppendTo.equals("")) if (!stringToAppendTo.equals(""))

14
source/test-resources/subsystem-test-context.xml
View File

@@ -29,16 +29,22 @@
</map> </map>
</property> </property>
</bean> </bean>
<bean id="testPortEarlyChecker1" class="org.alfresco.repo.management.subsystems.PortEarlyPropertyChecker"> <bean id="testPortEarlyChecker1" class="org.alfresco.repo.management.subsystems.test.TestPortEarlyPropertyChecker">
<constructor-arg value="TestSubsystem" /> <constructor-arg value="TestSubsystem" />
<constructor-arg value="false" /> <constructor-arg value="false" />
<constructor-arg value="true" /> <constructor-arg value="true" />
<property name="blockedPort">
<ref bean="testPortNumber" />
</property>
</bean> </bean>
<bean id="testPortEarlyChecker2" class="org.alfresco.repo.management.subsystems.PortEarlyPropertyChecker"> <bean id="testPortEarlyChecker2" class="org.alfresco.repo.management.subsystems.test.TestPortEarlyPropertyChecker">
<constructor-arg value="TestSubsystem" /> <constructor-arg value="TestSubsystem" />
<constructor-arg value="test.subsystem.host" /> <constructor-arg value="test.subsystem.host" />
<constructor-arg value="false" /> <constructor-arg value="false" />
<constructor-arg value="true" /> <constructor-arg value="true" />
<property name="wrongHost">
<ref bean="testHost" />
</property>
</bean> </bean>
<bean id="sampleService" class="org.alfresco.repo.management.subsystems.test.SampleService"> <bean id="sampleService" class="org.alfresco.repo.management.subsystems.test.SampleService">
@@ -50,4 +56,8 @@
</constructor-arg> </constructor-arg>
</bean> </bean>
<bean id="testHost" class="java.lang.String">
<constructor-arg type="java.lang.String" value="testHost"/>
</bean>
</beans> </beans>