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

Fixed bug that value of constraint "SOAPEncoding" in WFS capabilities is always "FALSE" #670

Merged
merged 1 commit into from
Aug 9, 2016
Merged

Fixed bug that value of constraint "SOAPEncoding" in WFS capabilities is always "FALSE" #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...s/deegree-services-wfs/src/main/java/org/deegree/services/wfs/GetCapabilitiesHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,11 @@ void export200()
}
constraints.add( new Domain( "KVPEncoding", "TRUE" ) );
constraints.add( new Domain( "XMLEncoding", "TRUE" ) );
constraints.add( new Domain( "SOAPEncoding", "FALSE" ) );
if ( master.isSoapSupported() ) {
constraints.add( new Domain( "SOAPEncoding", "TRUE" ) );
} else {
constraints.add( new Domain( "SOAPEncoding", "FALSE" ) );
}
constraints.add( new Domain( "ImplementsInheritance", "FALSE" ) );
constraints.add( new Domain( "ImplementsRemoteResolve", "FALSE" ) );
if ( master.isEnableResponsePaging() ) {
Expand Down
9 changes: 8 additions & 1 deletion ...rvices/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ public void doSOAP( SOAPEnvelope soapDoc, HttpServletRequest request, HttpRespon
throws ServletException, IOException, org.deegree.services.authentication.SecurityException {
LOG.debug( "doSOAP" );

if ( disableBuffering ) {
if ( !isSoapSupported() ) {
super.doSOAP( soapDoc, request, response, multiParts, factory );
return;
}
Expand Down Expand Up @@ -1381,6 +1381,13 @@ public boolean isEnableResponsePaging() {
return enableResponsePaging;
}

/**
* @return <code>true</code> if soap is supported, <code>false</code> otherwise
*/
public boolean isSoapSupported() {
return !disableBuffering;
}

/**
* Checks if a request version can be handled by this controller (i.e. if is supported by the implementation *and*
* offered by the current configuration).
Expand Down