Return-Path: Delivered-To: apmail-jakarta-jetspeed-dev-archive@www.apache.org Received: (qmail 84145 invoked from network); 4 Jan 2005 16:08:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 4 Jan 2005 16:08:34 -0000 Received: (qmail 7618 invoked by uid 500); 4 Jan 2005 16:06:36 -0000 Delivered-To: apmail-jakarta-jetspeed-dev-archive@jakarta.apache.org Received: (qmail 7533 invoked by uid 500); 4 Jan 2005 16:06:34 -0000 Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jetspeed Developers List" Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@jakarta.apache.org Received: (qmail 7463 invoked by uid 500); 4 Jan 2005 16:06:33 -0000 Received: (qmail 7424 invoked by uid 500); 4 Jan 2005 16:06:32 -0000 Received: (qmail 7418 invoked by uid 99); 4 Jan 2005 16:06:31 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 04 Jan 2005 08:06:28 -0800 Received: (qmail 81935 invoked by uid 1642); 4 Jan 2005 16:06:21 -0000 Date: 4 Jan 2005 16:06:21 -0000 Message-ID: <20050104160621.81934.qmail@minotaur.apache.org> From: weaver@apache.org To: jakarta-jetspeed-2-cvs@apache.org Subject: cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl CapabilityValveImpl.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N weaver 2005/01/04 08:06:21 Modified: portal/src/java/org/apache/jetspeed/capabilities/impl CapabilityValveImpl.java Log: Throw exception if capabilities could not be built instead of returning null. Revision Changes Path 1.7 +8 -8 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java Index: CapabilityValveImpl.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CapabilityValveImpl.java 1 Dec 2004 20:28:21 -0000 1.6 +++ CapabilityValveImpl.java 4 Jan 2005 16:06:21 -0000 1.7 @@ -22,6 +22,7 @@ import org.apache.jetspeed.capabilities.CapabilityMap; import org.apache.jetspeed.capabilities.MediaType; import org.apache.jetspeed.capabilities.MimeType; +import org.apache.jetspeed.capabilities.UnableToBuildCapabilityMapException; import org.apache.jetspeed.pipeline.PipelineException; import org.apache.jetspeed.pipeline.valve.CapabilityValve; import org.apache.jetspeed.pipeline.valve.ValveContext; @@ -60,17 +61,16 @@ String agent = request.getRequest().getHeader("User-Agent"); // Get capability map - CapabilityMap cm = capabilities.getCapabilityMap(agent); - - if (cm == null) + CapabilityMap cm; + try { - log.debug("Couldn't create capability map for agent: " + agent); + cm = capabilities.getCapabilityMap(agent); } - else + catch (UnableToBuildCapabilityMapException e) { - log.debug("Created Capability map for agent: " + agent); + throw new PipelineException("Falied to create capabilitied: "+e.getMessage(), e); } - + MediaType mediaType = cm.getPreferredMediaType(); MimeType mimeType = cm.getPreferredType(); --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org